xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

acid: don't assume mips

Browse source
This commit is contained in:
aiju 2011-07-22 19:46:17 +02:00
parent 4636a1e21a
commit e88e6c9a3b
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/src/cmd/acid/acid.h
View file

@ -27,7 +27,6 @@ typedef struct Type Type;
typedef struct Frtype Frtype; typedef struct Frtype Frtype;
Extern int kernel; Extern int kernel;
Extern int remote;
Extern int text; Extern int text;
Extern int silent; Extern int silent;
Extern Fhdr fhdr; Extern Fhdr fhdr;

27
sys/src/cmd/acid/main.c
View file

@ -60,19 +60,11 @@ main(int argc, char *argv[])
case 'q': case 'q':
quiet = 0; quiet = 0;
break; break;
case 'r':
pid = 1;
remote++;
kernel++;
break;
default: default:
usage(); usage();
}ARGEND }ARGEND
if(argc > 0) { if(argc > 0) {
if(remote)
aout = argv[0];
else
if(isnumeric(argv[0])) { if(isnumeric(argv[0])) {
pid = strtol(argv[0], 0, 0); pid = strtol(argv[0], 0, 0);
snprint(prog, sizeof(prog), "/proc/%d/text", pid); snprint(prog, sizeof(prog), "/proc/%d/text", pid);
@ -89,9 +81,7 @@ main(int argc, char *argv[])
} }
aout = argv[0]; aout = argv[0];
} }
} else }
if(remote)
aout = "/mips/9ch";
fmtinstall('x', xfmt); fmtinstall('x', xfmt);
fmtinstall('L', Lfmt); fmtinstall('L', Lfmt);
@ -258,7 +248,6 @@ readtext(char *s)
Value *v; Value *v;
uvlong length; uvlong length;
Symbol sym; Symbol sym;
extern Machdata mipsmach;
if(mtype != 0){ if(mtype != 0){
symmap = newmap(0, 1); symmap = newmap(0, 1);
@ -274,8 +263,6 @@ readtext(char *s)
return; return;
} }
machdata = &mipsmach;
if(!crackhdr(text, &fhdr)) { if(!crackhdr(text, &fhdr)) {
print("can't decode file header\n"); print("can't decode file header\n");
return; return;
@ -553,15 +540,11 @@ system(void)
static char *kernel; static char *kernel;
cpu = getenv("cputype"); cpu = getenv("cputype");
if(cpu == 0) { if(cpu == 0)
cpu = "mips"; sysfatal("$cputype not set");
print("$cputype not set; assuming %s\n", cpu);
}
p = getenv("terminal"); p = getenv("terminal");
if(p == 0 || (p=strchr(p, ' ')) == 0 || p[1] == ' ' || p[1] == 0) { if(p == 0 || (p=strchr(p, ' ')) == 0 || p[1] == ' ' || p[1] == 0)
p = "ch"; sysfatal("$terminal not set");
print("missing or bad $terminal; assuming %s\n", p);
}
else{ else{
p++; p++;
q = strchr(p, ' '); q = strchr(p, ' ');