Merge commit 'syslinux-3.55-pre4' into advsyslinux-3.60-pre7

7 files changed, 269 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 60826202..e3c2027c 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,10 @@ Changes in 3.55:
 	  but that MAY be reverted in the future if it causes
 	  problems.
 	* Documentation text files moved to a common "doc" directory;
-	  man pages from the Debian project added to the "man" directory.
+	  man pages from the Debian project added to the "man"
+	  directory.
+	* Correct bug with self-overlapping memory areas when using
+	  the shuffle interface.
 
 Changes in 3.54:
 	* Add "menu separator", "menu indent", "menu disabled"
diff --git a/bcopy32.inc b/bcopy32.inc
index 28b70fad..0f01284a 100644
--- a/bcopy32.inc
+++ b/bcopy32.inc
@@ -135,8 +135,8 @@ bcopy:		push eax
 		cmp esi,-1
 		je .bzero
 
-		cmp esi,edi		; If source > destination, we might
-		ja .reverse		; have to copy backwards
+		cmp esi,edi		; If source < destination, we might
+		jb .reverse		; have to copy backwards
 
 .forward:
 		mov al,cl		; Save low bits
diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index 7910020e..9925d23c 100644
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -1,6 +1,6 @@
 ## -----------------------------------------------------------------------
 ##
-##   Copyright 2001-2007 H. Peter Anvin - All Rights Reserved
+##   Copyright 2001-2008 H. Peter Anvin - All Rights Reserved
 ##
 ##   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
@@ -49,7 +49,7 @@ COM32DIR = $(AUXDIR)/com32
 
 MODULES	  = chain.c32 menu.c32 vesamenu.c32 ethersel.c32 mboot.c32 \
 	    dmitest.c32 cpuidtest.c32 pcitest.c32 elf.c32 linux.c32 \
-	    reboot.c32
+	    reboot.c32 pmload.c32
 TESTFILES =
 
 all: $(MODULES) $(TESTFILES)
diff --git a/com32/modules/linux.c b/com32/modules/linux.c
index c20536f3..90aab68b 100644
--- a/com32/modules/linux.c
+++ b/com32/modules/linux.c
@@ -204,8 +204,22 @@ int main(int argc, char *argv[])
   if ((arg = find_argument(argp, "mem=")))
     mem_limit = saturate32(suffix_number(arg));
 
-  if ((arg = find_argument(argp, "vga=")))
-    video_mode = strtoul(arg, NULL, 0);
+  if ((arg = find_argument(argp, "vga="))) {
+    switch (arg[0] | 0x20) {
+    case 'a':			/* "ask" */
+      video_mode = 0xfffd;
+      break;
+    case 'e':			/* "ext" */
+      video_mode = 0xfffe;
+      break;
+    case 'n':			/* "normal" */
+      video_mode = 0xffff;
+      break;
+    default:
+      video_mode = strtoul(arg, NULL, 0);
+      break;
+    }
+  }
 
   if ((arg = find_argument(argp, "initrd="))) {
     do {
diff --git a/com32/modules/pmload.c b/com32/modules/pmload.c
new file mode 100644
index 00000000..b45cf5f1
--- /dev/null
+++ b/com32/modules/pmload.c
@@ -0,0 +1,230 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
+ *
+ *   Permission is hereby granted, free of charge, to any person
+ *   obtaining a copy of this software and associated documentation
+ *   files (the "Software"), to deal in the Software without
+ *   restriction, including without limitation the rights to use,
+ *   copy, modify, merge, publish, distribute, sublicense, and/or
+ *   sell copies of the Software, and to permit persons to whom
+ *   the Software is furnished to do so, subject to the following
+ *   conditions:
+ *
+ *   The above copyright notice and this permission notice shall
+ *   be included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * pmload.c
+ *
+ * Load a binary file and run it in protected mode.  We give it
+ * an ELF-style invocation record, becase, why not?
+ *
+ * Usage: pmload.c32 filename address [arguments...]
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <elf.h>
+#include <console.h>
+
+#include <syslinux/loadfile.h>
+#include <syslinux/movebits.h>
+#include <syslinux/bootpm.h>
+
+/* If we don't have this much memory for the stack, signal failure */
+#define MIN_STACK	512
+
+#define DEBUG 0
+#if DEBUG
+# define dprintf printf
+#else
+# define dprintf(f, ...) ((void)0)
+#endif
+
+static inline void error(const char *msg)
+{
+  fputs(msg, stderr);
+}
+
+int boot_raw(void *ptr, size_t len, addr_t where, char **argv)
+{
+  struct syslinux_movelist *ml = NULL;
+  struct syslinux_memmap *mmap = NULL, *amap = NULL;
+  struct syslinux_pm_regs regs;
+  int argc;
+  addr_t argsize;
+  char **argp;
+  addr_t lstart, llen;
+  char *stack_frame = NULL;
+  addr_t stack_frame_size;
+  addr_t stack_pointer;
+  uint32_t *spp;
+  char *sfp;
+  addr_t sfa;
+
+  memset(&regs, 0, sizeof regs);
+
+  mmap = syslinux_memory_map();
+  amap = syslinux_dup_memmap(mmap);
+  if (!mmap || !amap)
+    goto bail;
+
+#if DEBUG
+  dprintf("Initial memory map:\n");
+  syslinux_dump_memmap(stdout, mmap);
+#endif
+
+  dprintf("Segment at 0x%08x len 0x%08x\n", where, len);
+
+  if (syslinux_memmap_type(amap, where, len) != SMT_FREE) {
+    printf("Memory segment at 0x%08x (len 0x%08x) is unavailable\n",
+	       where, len);
+    goto bail;		/* Memory region unavailable */
+  }
+
+  /* Mark this region as allocated in the available map */
+  if (syslinux_add_memmap(&amap, where, len, SMT_ALLOC))
+    goto bail;
+
+  /* Data present region.  Create a move entry for it. */
+  if (syslinux_add_movelist(&ml, where, (addr_t)ptr, len))
+    goto bail;
+
+  /* Create the invocation record (initial stack frame) */
+
+  argsize = argc = 0;
+  for (argp = argv; *argp; argp++) {
+    dprintf("argv[%2d] = \"%s\"\n", argc, *argp);
+    argc++;
+    argsize += strlen(*argp)+1;
+  }
+
+  /* We need the argument strings, argument pointers,
+     argc, plus four zero-word terminators. */
+  stack_frame_size = argsize + argc*sizeof(char *) + 5*sizeof(long);
+  stack_frame_size = (stack_frame_size+15) & ~15;
+  stack_frame = calloc(stack_frame_size, 1);
+  if (!stack_frame)
+    goto bail;
+
+#if DEBUG
+  dprintf("Right before syslinux_memmap_largest()...\n");
+  syslinux_dump_memmap(stdout, amap);
+#endif
+
+  if (syslinux_memmap_largest(amap, SMT_FREE, &lstart, &llen))
+    goto bail;			/* NO free memory?! */
+
+  if (llen < stack_frame_size+MIN_STACK+16)
+    goto bail;			/* Insufficient memory  */
+
+  /* Initial stack pointer address */
+  stack_pointer = (lstart+llen-stack_frame_size) & ~15;
+
+  dprintf("Stack frame at 0x%08x len 0x%08x\n",
+	  stack_pointer, stack_frame_size);
+
+  /* Create the stack frame.  sfp is the pointer in current memory for
+     the next argument string, sfa is the address in its final resting place.
+     spp is the pointer into the argument array in current memory. */
+  spp = (uint32_t *)stack_frame;
+  sfp = stack_frame + argc*sizeof(char *) + 5*sizeof(long);
+  sfa = stack_pointer + argc*sizeof(char *) + 5*sizeof(long);
+
+  *spp++ = argc;
+  for (argp = argv; *argp; argp++) {
+    int bytes = strlen(*argp) + 1; /* Including final null */
+    *spp++ = sfa;
+    memcpy(sfp, *argp, bytes);
+    sfp += bytes;
+    sfa += bytes;
+  }
+  /* Zero fields are aready taken care of by calloc() */
+
+  /* ... and we'll want to move it into the right place... */
+#if DEBUG
+  if (syslinux_memmap_type(amap, stack_pointer, stack_frame_size)
+      != SMT_FREE) {
+    dprintf("Stack frame area not free (how did that happen?)!\n");
+    goto bail;		/* Memory region unavailable */
+  }
+#endif
+
+  if (syslinux_add_memmap(&amap, stack_pointer, stack_frame_size, SMT_ALLOC))
+    goto bail;
+
+  if (syslinux_add_movelist(&ml, stack_pointer, (addr_t)stack_frame,
+			    stack_frame_size))
+    goto bail;
+
+  memset(&regs, 0, sizeof regs);
+  regs.eip = where;
+  regs.esp = stack_pointer;
+
+#if DEBUG
+  dprintf("Final memory map:\n");
+  syslinux_dump_memmap(stdout, mmap);
+
+  dprintf("Final available map:\n");
+  syslinux_dump_memmap(stdout, amap);
+
+  dprintf("Movelist:\n");
+  syslinux_dump_movelist(stdout, ml);
+#endif
+
+  /* This should not return... */
+  fputs("Booting...\n", stdout);
+  syslinux_shuffle_boot_pm(ml, mmap, 0, &regs);
+
+ bail:
+  if (stack_frame)
+    free(stack_frame);
+  syslinux_free_memmap(amap);
+  syslinux_free_memmap(mmap);
+  syslinux_free_movelist(ml);
+
+  return -1;
+}
+
+int main(int argc, char *argv[])
+{
+  void *data;
+  size_t data_len;
+  addr_t where;
+
+  openconsole(&dev_null_r, &dev_stdcon_w);
+
+  if (argc < 3) {
+    error("Usage: pmload.c32 bin_file address arguments...\n");
+    return 1;
+  }
+
+  where = strtoul(argv[2], NULL, 0);
+
+  if (loadfile(argv[1], &data, &data_len)) {
+    error("Unable to load file\n");
+    return 1;
+  }
+
+  boot_raw(data, data_len, where, &argv[1]);
+  error("Failed to boot, probably insufficient memory\n");
+  return 1;
+}
diff --git a/doc/syslinux.doc b/doc/syslinux.doc
index 17370739..90f333ec 100644
--- a/doc/syslinux.doc
+++ b/doc/syslinux.doc
@@ -30,6 +30,20 @@ extlinux.doc for what differs in these versions.
 Help with cleaning up the docs would be greatly appreciated.
 
 
+   ++++ Options ++++
+
+These are the options common to all versions of Syslinux:
+
+	-s	Safe, slow, stupid; uses simpler code that boots better
+	-f	Force installing
+
+These are only in the Windows version:
+
+	-m	Mbr; install a bootable MBR sector to the beginning of the
+		drive.
+	-a	Active; marks the partition used active (=bootable)
+
+
    ++++ CREATING A BOOTABLE LINUX FLOPPY +++
 
 In order to create a bootable Linux floppy using SYSLINUX, prepare a
diff --git a/syslinux.spec.in b/syslinux.spec.in
index e8ff2855..cb94c8c1 100644
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -96,7 +96,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc COPYING NEWS doc/*
 %doc sample
-%doc %{_mandir}/man
+%{_mandir}/man/man*/*
 %{_bindir}/syslinux
 %{_bindir}/ppmtolss16
 %{_bindir}/lss16toppm