ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6192eedb: Merge "Fix \'r\' for LP64."

Browse source 
* commit '6192eedb43bfa949569850b5cf4a6550b2c62f08':
  Fix 'r' for LP64.
This commit is contained in:
Elliott Hughes 2014-01-17 11:19:49 -08:00 • committed by Android Git Automerger
commit f62b602f45
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
toolbox/r.c
View file

@ -1,8 +1,16 @@
#include <fcntl.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <string.h> #include <string.h>
#include <sys/mman.h>
#if __LP64__
#define strtoptr strtoull
#else
#define strtoptr strtoul
#endif
static int usage() static int usage()
{ {
@ -12,14 +20,9 @@ static int usage()
int r_main(int argc, char *argv[]) int r_main(int argc, char *argv[])
{ {
int width = 4, set = 0, fd;
unsigned addr, value, endaddr = 0;
unsigned long mmap_start, mmap_size;
void *page;
char *end;
if(argc < 2) return usage(); if(argc < 2) return usage();
int width = 4;
if(!strcmp(argv[1], "-b")) { if(!strcmp(argv[1], "-b")) {
width = 1; width = 1;
argc--; argc--;
@ -31,37 +34,40 @@ int r_main(int argc, char *argv[])
} }
if(argc < 2) return usage(); if(argc < 2) return usage();
addr = strtoul(argv[1], 0, 16); uintptr_t addr = strtoptr(argv[1], 0, 16);
end = strchr(argv[1], '-'); uintptr_t endaddr = 0;
char* end = strchr(argv[1], '-');
if (end) if (end)
endaddr = strtoul(end + 1, 0, 16); endaddr = strtoptr(end + 1, 0, 16);
if (!endaddr) if (!endaddr)
endaddr = addr + width - 1; endaddr = addr + width - 1;
if (endaddr <= addr) { if (endaddr <= addr) {
fprintf(stderr, "invalid end address\n"); fprintf(stderr, "end address <= start address\n");
return -1; return -1;
} }
bool set = false;
uint32_t value = 0;
if(argc > 2) { if(argc > 2) {
set = 1; set = true;
value = strtoul(argv[2], 0, 16); value = strtoul(argv[2], 0, 16);
} }
fd = open("/dev/mem", O_RDWR | O_SYNC); int fd = open("/dev/mem", O_RDWR | O_SYNC);
if(fd < 0) { if(fd < 0) {
fprintf(stderr,"cannot open /dev/mem\n"); fprintf(stderr,"cannot open /dev/mem\n");
return -1; return -1;
} }
mmap_start = addr & ~(PAGE_SIZE - 1); off64_t mmap_start = addr & ~(PAGE_SIZE - 1);
mmap_size = endaddr - mmap_start + 1; size_t mmap_size = endaddr - mmap_start + 1;
mmap_size = (mmap_size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1); mmap_size = (mmap_size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
page = mmap(0, mmap_size, PROT_READ | PROT_WRITE, void* page = mmap64(0, mmap_size, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, mmap_start); 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");
@ -71,21 +77,21 @@ int r_main(int argc, char *argv[])
while (addr <= endaddr) { while (addr <= endaddr) {
switch(width){ switch(width){
case 4: { case 4: {
unsigned *x = (unsigned*) (((unsigned) page) + (addr & 4095)); uint32_t* x = (uint32_t*) (((uintptr_t) page) + (addr & 4095));
if(set) *x = value; if(set) *x = value;
fprintf(stderr,"%08x: %08x\n", addr, *x); fprintf(stderr,"%08"PRIxPTR": %08x\n", addr, *x);
break; break;
} }
case 2: { case 2: {
unsigned short *x = (unsigned short*) (((unsigned) page) + (addr & 4095)); uint16_t* x = (uint16_t*) (((uintptr_t) page) + (addr & 4095));
if(set) *x = value; if(set) *x = value;
fprintf(stderr,"%08x: %04x\n", addr, *x); fprintf(stderr,"%08"PRIxPTR": %04x\n", addr, *x);
break; break;
} }
case 1: { case 1: {
unsigned char *x = (unsigned char*) (((unsigned) page) + (addr & 4095)); uint8_t* x = (uint8_t*) (((uintptr_t) page) + (addr & 4095));
if(set) *x = value; if(set) *x = value;
fprintf(stderr,"%08x: %02x\n", addr, *x); fprintf(stderr,"%08"PRIxPTR": %02x\n", addr, *x);
break; break;
} }
} }