am 6fa54fa2: Merge "Accept address ranges in r" into honeycomb

* commit '6fa54fa2234920e36b0563082af3a0bc6c8da640':
  Accept address ranges in r
This commit is contained in:
Colin Cross 2011-01-19 17:42:21 -08:00 committed by Android Git Automerger
commit 618eca4ed9

View file

@ -13,8 +13,10 @@ static int usage()
int r_main(int argc, char *argv[]) int r_main(int argc, char *argv[])
{ {
int width = 4, set = 0, fd; int width = 4, set = 0, fd;
unsigned addr, value; unsigned addr, value, endaddr = 0;
unsigned long mmap_start, mmap_size;
void *page; void *page;
char *end;
if(argc < 2) return usage(); if(argc < 2) return usage();
@ -31,6 +33,18 @@ int r_main(int argc, char *argv[])
if(argc < 2) return usage(); if(argc < 2) return usage();
addr = strtoul(argv[1], 0, 16); addr = strtoul(argv[1], 0, 16);
end = strchr(argv[1], '-');
if (end)
endaddr = strtoul(end + 1, 0, 16);
if (!endaddr)
endaddr = addr + width - 1;
if (endaddr <= addr) {
fprintf(stderr, "invalid end address\n");
return -1;
}
if(argc > 2) { if(argc > 2) {
set = 1; set = 1;
value = strtoul(argv[2], 0, 16); value = strtoul(argv[2], 0, 16);
@ -42,33 +56,40 @@ int r_main(int argc, char *argv[])
return -1; return -1;
} }
page = mmap(0, 8192, PROT_READ | PROT_WRITE, mmap_start = addr & ~(PAGE_SIZE - 1);
MAP_SHARED, fd, addr & (~4095)); mmap_size = endaddr - mmap_start + 1;
mmap_size = (mmap_size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
page = mmap(0, mmap_size, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, mmap_start);
if(page == MAP_FAILED){ if(page == MAP_FAILED){
fprintf(stderr,"cannot mmap region\n"); fprintf(stderr,"cannot mmap region\n");
return -1; return -1;
} }
switch(width){ while (addr <= endaddr) {
case 4: { switch(width){
unsigned *x = (unsigned*) (((unsigned) page) + (addr & 4095)); case 4: {
if(set) *x = value; unsigned *x = (unsigned*) (((unsigned) page) + (addr & 4095));
fprintf(stderr,"%08x: %08x\n", addr, *x); if(set) *x = value;
break; fprintf(stderr,"%08x: %08x\n", addr, *x);
break;
}
case 2: {
unsigned short *x = (unsigned short*) (((unsigned) page) + (addr & 4095));
if(set) *x = value;
fprintf(stderr,"%08x: %04x\n", addr, *x);
break;
}
case 1: {
unsigned char *x = (unsigned char*) (((unsigned) page) + (addr & 4095));
if(set) *x = value;
fprintf(stderr,"%08x: %02x\n", addr, *x);
break;
}
}
addr += width;
} }
case 2: {
unsigned short *x = (unsigned short*) (((unsigned) page) + (addr & 4095));
if(set) *x = value;
fprintf(stderr,"%08x: %04x\n", addr, *x);
break;
}
case 1: {
unsigned char *x = (unsigned char*) (((unsigned) page) + (addr & 4095));
if(set) *x = value;
fprintf(stderr,"%08x: %02x\n", addr, *x);
break;
}
}
return 0; return 0;
} }