[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] The set of patches below add support for loading plan9's a.out



ChangeSet 1.1752, 2005/06/24 11:51:38+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        The set of patches below add support for loading plan9's a.out
        format using the linux builder.  This is considerably simpler
        than having a seperate builder, shares more code and should
        be easier to maintain.  Hopefully the original plan9 builder
        can go away in the future.
        
        I've been able to test this manually with vm-tools but am
        still having some problems (unrelated I think) with xm.
        
        Signed-off-by: Tim Newsham <newsham@xxxxxxxx>



 Makefile         |    1 
 xc_aout9.h       |   30 +++++++++
 xc_linux_build.c |    4 -
 xc_load_aout9.c  |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 xc_private.h     |    1 
 5 files changed, 201 insertions(+), 1 deletion(-)


diff -Nru a/tools/libxc/Makefile b/tools/libxc/Makefile
--- a/tools/libxc/Makefile      2005-06-24 07:02:48 -04:00
+++ b/tools/libxc/Makefile      2005-06-24 07:02:48 -04:00
@@ -19,6 +19,7 @@
 SRCS     += xc_domain.c
 SRCS     += xc_evtchn.c
 SRCS     += xc_gnttab.c
+SRCS     += xc_load_aout9.c
 SRCS     += xc_load_bin.c
 SRCS     += xc_load_elf.c
 SRCS     += xc_linux_build.c
diff -Nru a/tools/libxc/xc_aout9.h b/tools/libxc/xc_aout9.h
--- /dev/null   Wed Dec 31 16:00:00 196900
+++ b/tools/libxc/xc_aout9.h    2005-06-24 07:02:48 -04:00
@@ -0,0 +1,30 @@
+
+typedef struct Exec
+{
+       long    magic;          /* magic number */
+       long    text;           /* size of text segment */
+       long    data;           /* size of initialized data */
+       long    bss;            /* size of uninitialized data */
+       long    syms;           /* size of symbol table */
+       long    entry;          /* entry point */
+       long    spsz;           /* size of pc/sp offset table */
+       long    pcsz;           /* size of pc/line number table */
+} Exec;
+
+#define        _MAGIC(b)       ((((4*b)+0)*b)+7)
+#define        A_MAGIC         _MAGIC(8)       /* 68020 */
+#define        I_MAGIC         _MAGIC(11)      /* intel 386 */
+#define        J_MAGIC         _MAGIC(12)      /* intel 960 (retired) */
+#define        K_MAGIC         _MAGIC(13)      /* sparc */
+#define        V_MAGIC         _MAGIC(16)      /* mips 3000 BE */
+#define        X_MAGIC         _MAGIC(17)      /* att dsp 3210 (retired) */
+#define        M_MAGIC         _MAGIC(18)      /* mips 4000 BE */
+#define        D_MAGIC         _MAGIC(19)      /* amd 29000 (retired) */
+#define        E_MAGIC         _MAGIC(20)      /* arm */
+#define        Q_MAGIC         _MAGIC(21)      /* powerpc */
+#define        N_MAGIC         _MAGIC(22)      /* mips 4000 LE */
+#define        L_MAGIC         _MAGIC(23)      /* dec alpha */
+#define        P_MAGIC         _MAGIC(24)      /* mips 3000 LE */
+#define        U_MAGIC         _MAGIC(25)      /* sparc64 */
+#define        S_MAGIC         _MAGIC(26)      /* amd64 */
+
diff -Nru a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c      2005-06-24 07:02:48 -04:00
+++ b/tools/libxc/xc_linux_build.c      2005-06-24 07:02:48 -04:00
@@ -14,6 +14,7 @@
 
 
 #include "xc_elf.h"
+#include "xc_aout9.h"
 #include <stdlib.h>
 #include <zlib.h>
 
@@ -38,7 +39,8 @@
                             struct load_funcs *load_funcs)
 {
     if ( probe_elf(image, image_size, load_funcs) &&
-         probe_bin(image, image_size, load_funcs) )
+         probe_bin(image, image_size, load_funcs) &&
+        probe_aout9(image, image_size, load_funcs) )
     {
         ERROR( "Unrecognized image format" );
         return -EINVAL;
diff -Nru a/tools/libxc/xc_load_aout9.c b/tools/libxc/xc_load_aout9.c
--- /dev/null   Wed Dec 31 16:00:00 196900
+++ b/tools/libxc/xc_load_aout9.c       2005-06-24 07:02:48 -04:00
@@ -0,0 +1,166 @@
+
+#include "xc_private.h"
+#include "xc_aout9.h"
+
+#if defined(__i386__)
+  #define A9_MAGIC I_MAGIC
+#elif defined(__x86_64__)
+  #define A9_MAGIC S_MAGIC
+#elif defined(__ia64__)
+  #define A9_MAGIC 0
+#else
+#error "Unsupported architecture"
+#endif
+
+
+#define round_pgup(_p)    (((_p)+(PAGE_SIZE-1))&PAGE_MASK)
+#define round_pgdown(_p)  ((_p)&PAGE_MASK)
+
+static int parseaout9image(char *, unsigned long, struct domain_setup_info *);
+static int loadaout9image(char *, unsigned long, int, u32, unsigned long *, 
struct domain_setup_info *);
+static void copyout(int, u32, unsigned long *, unsigned long, void *, int);
+struct Exec *get_header(unsigned char *, unsigned long, struct Exec *);
+
+
+int 
+probe_aout9(
+    char *image,
+    unsigned long image_size,
+    struct load_funcs *load_funcs)
+{
+    struct Exec ehdr;
+
+    if (!get_header(image, image_size, &ehdr)) {
+        ERROR("Kernel image does not have a a.out9 header.");
+        return -EINVAL;
+    }
+
+    load_funcs->parseimage = parseaout9image;
+    load_funcs->loadimage = loadaout9image;
+    return 0;
+}
+
+static int 
+parseaout9image(
+    char *image,
+    unsigned long image_size,
+    struct domain_setup_info *dsi)
+{
+    struct Exec ehdr;
+    unsigned long start, txtsz, end;
+
+    if (!get_header(image, image_size, &ehdr)) {
+        ERROR("Kernel image does not have a a.out9 header.");
+        return -EINVAL;
+    }
+
+    if (sizeof ehdr + ehdr.text + ehdr.data > image_size) {
+        ERROR("a.out program extends past end of image.");
+        return -EINVAL;
+    }
+
+    start = round_pgdown(ehdr.entry);
+    txtsz = round_pgup(ehdr.text);
+    end = start + txtsz + ehdr.data + ehdr.bss;
+
+    dsi->v_start       = start;
+    dsi->v_kernstart   = start;
+    dsi->v_kernend     = end;
+    dsi->v_kernentry   = ehdr.entry;
+    dsi->v_end         = end;
+
+    /* XXX load symbols */
+
+    return 0;
+}
+
+static int 
+loadaout9image(
+    char *image,
+    unsigned long image_size,
+    int xch, u32 dom,
+    unsigned long *parray,
+    struct domain_setup_info *dsi)
+{
+    struct Exec ehdr;
+    unsigned long txtsz;
+
+    if (!get_header(image, image_size, &ehdr)) {
+        ERROR("Kernel image does not have a a.out9 header.");
+        return -EINVAL;
+    }
+
+    txtsz = round_pgup(ehdr.text);
+    copyout(xch, dom, parray, 
+            0, image, sizeof ehdr + ehdr.text);
+    copyout(xch, dom, parray, 
+            txtsz, image + sizeof ehdr + ehdr.text, ehdr.data);
+    /* XXX zeroing of BSS needed? */
+
+    /* XXX load symbols */
+
+    return 0;
+}
+
+/*
+ * copyout data to the domain given an offset to the start
+ * of its memory region described by parray.
+ */
+static void
+copyout(
+    int xch, u32 dom,
+    unsigned long *parray,
+    unsigned long off,
+    void *buf,
+    int sz)
+{
+    unsigned long pgoff, chunksz;
+    void *pg;
+
+    while (sz > 0) {
+        pgoff = off & (PAGE_SIZE-1);
+        chunksz = sz;
+        if(chunksz > PAGE_SIZE - pgoff)
+            chunksz = PAGE_SIZE - pgoff;
+
+        pg = xc_map_foreign_range(xch, dom, PAGE_SIZE, PROT_WRITE, 
+                                  parray[off>>PAGE_SHIFT]);
+        memcpy(pg + pgoff, buf, chunksz);
+        munmap(pg, PAGE_SIZE);
+
+        off += chunksz;
+        buf += chunksz;
+        sz -= chunksz;
+    }
+}
+    
+/*
+ * Decode the header from the start of image and return it.
+ */
+struct Exec *
+get_header(
+    unsigned char *image,
+    unsigned long image_size,
+    struct Exec *ehdr)
+{
+    unsigned long *v;
+    int i;
+
+    if (A9_MAGIC == 0)
+        return 0;
+
+    if (image_size < sizeof ehdr)
+        return 0;
+
+    /* ... all big endian words */
+    v = (unsigned long *)ehdr;
+    for (i = 0; i < sizeof *ehdr; i += 4) {
+        v[i/4] = (image[i+0]<<24) | (image[i+1]<<16) | 
+                 (image[i+2]<<8) | image[i+3];
+    }
+
+    if(ehdr->magic != A9_MAGIC)
+        return 0;
+    return ehdr;
+}
+
diff -Nru a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h
--- a/tools/libxc/xc_private.h  2005-06-24 07:02:48 -04:00
+++ b/tools/libxc/xc_private.h  2005-06-24 07:02:48 -04:00
@@ -310,5 +310,6 @@
 /* image loading */
 int probe_elf(char *image, unsigned long image_size, struct load_funcs *funcs);
 int probe_bin(char *image, unsigned long image_size, struct load_funcs *funcs);
+int probe_aout9(char *image, unsigned long image_size, struct load_funcs 
*funcs);
 
 #endif /* __XC_PRIVATE_H__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.