snap: consequently use ulong for page index and count
This commit is contained in:
parent
5692788724
commit
3363693205
|
@ -134,9 +134,9 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
|
|||
{
|
||||
Seg *s;
|
||||
Page **pp;
|
||||
int i, npg;
|
||||
int t;
|
||||
int n, len;
|
||||
ulong i, npg;
|
||||
ulong pid;
|
||||
uvlong off;
|
||||
char buf[Pagesize];
|
||||
|
@ -160,13 +160,13 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
|
|||
len = Pagesize;
|
||||
for(i=0; i<npg; i++) {
|
||||
if(i == npg-1)
|
||||
len = s->len - i*Pagesize;
|
||||
len = s->len - (uvlong)i*Pagesize;
|
||||
|
||||
switch(t = Bgetc(b)) {
|
||||
case 'z':
|
||||
pp[i] = datapage(zero, len);
|
||||
if(debug)
|
||||
fprint(2, "0x%.8llux all zeros\n", s->offset+i*Pagesize);
|
||||
fprint(2, "0x%.8llux all zeros\n", s->offset+(uvlong)i*Pagesize);
|
||||
break;
|
||||
case 'm':
|
||||
case 't':
|
||||
|
@ -177,14 +177,15 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
|
|||
if(pp[i] == nil)
|
||||
panic("bad page reference in snapshot");
|
||||
if(debug)
|
||||
fprint(2, "0x%.8llux same as %s pid %lud 0x%.8llux\n", s->offset+i*Pagesize, t=='m'?"mem":"text", pid, off);
|
||||
fprint(2, "0x%.8llux same as %s pid %lud 0x%.8llux\n",
|
||||
s->offset+(uvlong)i*Pagesize, t=='m'?"mem":"text", pid, off);
|
||||
break;
|
||||
case 'r':
|
||||
if((n=Bread(b, buf, len)) != len)
|
||||
sysfatal("short read of segment %d/%d at %llx: %r", n, len, Boffset(b));
|
||||
pp[i] = datapage(buf, len);
|
||||
if(debug)
|
||||
fprint(2, "0x%.8llux is raw data\n", s->offset+i*Pagesize);
|
||||
fprint(2, "0x%.8llux is raw data\n", s->offset+(uvlong)i*Pagesize);
|
||||
break;
|
||||
default:
|
||||
fprint(2, "bad type char %#.2ux\n", t);
|
||||
|
|
|
@ -18,7 +18,7 @@ char *pfile[Npfile] = {
|
|||
static void
|
||||
writeseg(Biobuf *b, Proc *proc, Seg *s)
|
||||
{
|
||||
int i, npg;
|
||||
ulong i, npg;
|
||||
Page **pp, *p;
|
||||
int type;
|
||||
|
||||
|
@ -50,7 +50,7 @@ writeseg(Biobuf *b, Proc *proc, Seg *s)
|
|||
abort();
|
||||
p->written = 1;
|
||||
p->type = type;
|
||||
p->offset = s->offset + i*Pagesize;
|
||||
p->offset = s->offset + (uvlong)i*Pagesize;
|
||||
p->pid = proc->pid;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue