JehanneOS/drawterm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

amd64 fixes

Browse Source
This commit is contained in:
Russ Cox
2006-05-21 16:32:29 +00:00
parent af11a9e129
commit 5797fdc0c0
28 changed files with 116 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libmemdraw/alloc.c
View File

@ -19,7 +19,7 @@ memimagemove(void *from, void *to)
md->base = to;
/* if allocmemimage changes this must change too */
md->bdata = (uchar*)&md->base[2];
md->bdata = (uchar*)md->base+sizeof(Memdata*)+sizeof(ulong);
}
Memimage*
@ -70,7 +70,8 @@ Memimage*
_allocmemimage(Rectangle r, ulong chan)
{
int d;
ulong l, nw;
u32int l, nw;
uchar *p;
Memdata *md;
Memimage *i;
@ -86,18 +87,21 @@ _allocmemimage(Rectangle r, ulong chan)
return nil;
md->ref = 1;
md->base = poolalloc(imagmem, (2+nw)*sizeof(ulong));
md->base = poolalloc(imagmem, sizeof(Memdata*)+(1+nw)*sizeof(ulong));
if(md->base == nil){
free(md);
return nil;
}
md->base[0] = (ulong)md;
md->base[1] = getcallerpc(&r);
p = (uchar*)md->base;
*(Memdata**)p = md;
p += sizeof(Memdata*);
*(ulong*)p = getcallerpc(&r);
p += sizeof(ulong);
/* if this changes, memimagemove must change too */
md->bdata = (uchar*)&md->base[2];
md->bdata = p;
md->allocd = 1;
i = allocmemimaged(r, chan, md, nil);
@ -129,7 +133,7 @@ _freememimage(Memimage *i)
ulong*
wordaddr(Memimage *i, Point p)
{
return (ulong*) ((ulong)byteaddr(i, p) & ~(sizeof(ulong)-1));
return (ulong*) ((uintptr)byteaddr(i, p) & ~(sizeof(ulong)-1));
}
uchar*