marshal(1): fix example: upas/mail -> mail (thanks fulton)

[plan9front.git] / sys / src / libmach / access.c

diff --git a/sys/src/libmach/access.c b/sys/src/libmach/access.c
index 784ee615837b48ab584fc277a4641d857229578a..ff84d777e00d2d61b85fd45486506a03c26041e1 100644 (file)
--- a/sys/src/libmach/access.c
+++ b/sys/src/libmach/access.c
@@ -42,7 +42,7 @@ get8(Map *map, uvlong addr, uvlong *x)
                return -1;
        }
 
-       if (map->nsegs == 1 && map->seg[0].fd < 0) {
+       if (map->nsegs == 1 && map->seg[0].fd < 0 && map->seg[0].read == nil) {
                *x = addr;
                return 1;
        }
@@ -60,7 +60,7 @@ get4(Map *map, uvlong addr, ulong *x)
                return -1;
        }
 
-       if (map->nsegs == 1 && map->seg[0].fd < 0) {
+       if (map->nsegs == 1 && map->seg[0].fd < 0 && map->seg[0].read == nil) {
                *x = addr;
                return 1;
        }
@@ -78,7 +78,7 @@ get2(Map *map, uvlong addr, ushort *x)
                return -1;
        }
 
-       if (map->nsegs == 1 && map->seg[0].fd < 0) {
+       if (map->nsegs == 1 && map->seg[0].fd < 0 && map->seg[0].read == nil) {
                *x = addr;
                return 1;
        }
@@ -98,7 +98,7 @@ get1(Map *map, uvlong addr, uchar *x, int size)
                return -1;
        }
 
-       if (map->nsegs == 1 && map->seg[0].fd < 0) {
+       if (map->nsegs == 1 && map->seg[0].fd < 0 && map->seg[0].read == nil) {
                cp = (uchar*)&addr;
                while (cp < (uchar*)(&addr+1) && size-- > 0)
                        *x++ = *cp++;
@@ -171,6 +171,9 @@ spread(struct segment *s, void *buf, int n, uvlong off)
                char a[8192];
                uvlong off;
        } cache;
+       
+       if(s->read != nil)
+               return s->read(s->fd, buf, n, off);
 
        if(s->cache){
                base = off&~(sizeof cache.a-1);
@@ -204,7 +207,7 @@ mget(Map *map, uvlong addr, void *buf, int size)
        s = reloc(map, addr, (vlong*)&off);
        if (!s)
                return -1;
-       if (s->fd < 0) {
+       if (s->fd < 0 && s->read == nil) {
                werrstr("unreadable map");
                return -1;
        }
@@ -263,7 +266,17 @@ reloc(Map *map, uvlong addr, vlong *offp)
        for (i = 0; i < map->nsegs; i++) {
                if (map->seg[i].inuse)
                if (map->seg[i].b <= addr && addr < map->seg[i].e) {
-                       *offp = addr + map->seg[i].f - map->seg[i].b;
+                       addr += map->seg[i].f - map->seg[i].b;
+
+                       /*
+                        * avoid negative file offsets for kernel
+                        * addresses by clearing the sign bit.
+                        * devproc sign extends back to 64 bit.
+                        */
+                       addr <<= 1;
+                       addr >>= 1;
+
+                       *offp = addr;
                        return &map->seg[i];
                }
        }