Merge commit 'origin/master' into nolennolen

2 files changed, 163 insertions, 1 deletions

diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index 8a127e62..690183ec 100644
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -52,7 +52,8 @@ INCDIR   = /usr/include
 COM32DIR = $(AUXDIR)/com32
 
 MODULES	  = chain.c32 ethersel.c32 mboot.c32 dmitest.c32 cpuidtest.c32 \
-	    pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 meminfo.c32
+	    pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 meminfo.c32 \
+	    sdi.c32
 TESTFILES =
 
 all: $(MODULES) $(TESTFILES)
diff --git a/com32/modules/sdi.c b/com32/modules/sdi.c
new file mode 100644
index 00000000..364db449
--- /dev/null
+++ b/com32/modules/sdi.c
@@ -0,0 +1,161 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 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
+ *   the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *   Boston MA 02110-1301, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * sdi.c
+ *
+ * Loader for the Microsoft System Deployment Image (SDI) format
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <minmax.h>
+#include <sys/stat.h>
+#include <console.h>
+
+#include <syslinux/loadfile.h>
+#include <syslinux/movebits.h>
+#include <syslinux/bootrm.h>
+
+#define DEBUG 0
+#if DEBUG
+# define dprintf printf
+#else
+# define dprintf(f, ...) ((void)0)
+#endif
+
+struct SDIHeader {
+  uint32_t Signature;
+  char     Version[4];
+  uint64_t SDIReserved;
+  uint64_t BootCodeOffset;
+  uint64_t BootCodeSize;
+};
+
+#define SDI_LOAD_ADDR	(16 << 20) /* 16 MB */
+#define SDI_SIGNATURE	('$' + ('S' << 8) + ('D' << 16) + ('I' << 24))
+
+static inline void error(const char *msg)
+{
+  fputs(msg, stderr);
+}
+
+static int boot_sdi(void *ptr, size_t len)
+{
+  const struct SDIHeader *hdr = ptr;
+  struct syslinux_memmap *mmap = NULL, *amap = NULL;
+  struct syslinux_rm_regs regs;
+  struct syslinux_movelist *ml = NULL;
+  char *boot_blob;
+
+  /* **** Basic sanity checking **** */
+  if (hdr->Signature != SDI_SIGNATURE) {
+    fputs("No $SDI signature in file\n", stdout);
+    goto bail;
+  }
+  if (memcmp(hdr->Version, "0001", 4)) {
+    int i;
+    fputs("Warning: unknown SDI version: ", stdout);
+    for (i = 0; i < 4; i++)
+      putchar(hdr->Version[i]);
+    putchar('\n');
+    /* Then try anyway... */
+  }
+
+  /* **** Setup **** */
+  mmap = syslinux_memory_map();
+  amap = syslinux_dup_memmap(mmap);
+  if (!mmap || !amap)
+    goto bail;
+
+  /* **** Map the BOOT BLOB to 0x7c00 **** */
+  if (!hdr->BootCodeOffset) {
+    fputs("No BOOT BLOB in image\n", stdout);
+    goto bail;
+  }
+  if (!hdr->BootCodeSize) {
+    fputs("BOOT BLOB is empty\n", stdout);
+    goto bail;
+  }
+  if (len < hdr->BootCodeOffset + hdr->BootCodeSize) {
+    fputs("BOOT BLOB extends beyond file\n", stdout);
+    goto bail;
+  }
+
+  if (syslinux_memmap_type(amap, 0x7c00, hdr->BootCodeSize) != SMT_FREE) {
+    fputs("BOOT BLOB too large for memory\n", stdout);
+    goto bail;
+  }
+  if (syslinux_add_memmap(&amap, 0x7c00, hdr->BootCodeSize, SMT_ALLOC))
+    goto bail;
+
+  /* The shuffle library doesn't handle duplication well... */
+  boot_blob = malloc(hdr->BootCodeSize);
+  if (!boot_blob)
+    goto bail;
+  memcpy(boot_blob, (char *)ptr + hdr->BootCodeOffset, hdr->BootCodeSize);
+
+  if (syslinux_add_movelist(&ml, 0x7c00, (addr_t)boot_blob, hdr->BootCodeSize))
+    goto bail;
+
+  /* **** Map the entire image to SDI_LOAD_ADDR **** */
+  if (syslinux_memmap_type(amap, SDI_LOAD_ADDR, len) != SMT_FREE) {
+    fputs("Image too large for memory\n", stdout);
+    goto bail;
+  }
+  if (syslinux_add_memmap(&amap, SDI_LOAD_ADDR, len, SMT_ALLOC))
+    goto bail;
+  if (syslinux_add_movelist(&ml, SDI_LOAD_ADDR, (addr_t)ptr, len))
+    goto bail;
+
+  /* **** Set up registers **** */
+  memset(&regs, 0, sizeof regs);
+  regs.ip    = 0x7c00;
+  regs.esp.l = 0x7c00;
+  regs.edx.l = SDI_LOAD_ADDR | 0x41;
+
+  fputs("Booting...\n", stdout);
+  syslinux_shuffle_boot_rm(ml, mmap, 0, &regs);
+
+ bail:
+  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;
+
+  openconsole(&dev_null_r, &dev_stdcon_w);
+
+  if (argc != 2) {
+    error("Usage: sdi.c32 sdi_file\n");
+    return 1;
+  }
+
+  if (loadfile(argv[1], &data, &data_len)) {
+    error("Unable to load file\n");
+    return 1;
+  }
+
+  boot_sdi(data, data_len);
+  error("Invalid SDI file or insufficient memory\n");
+  return 1;
+}