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

libmach: use correct kernel base, kprof: use kernel base from libmach (from applied/kprof patch)

Browse source
This commit is contained in:
cinap_lenrek 2012-02-13 06:06:13 +01:00
parent c9f5d14ea6
commit 6cb7ba7ed5
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sys/src/cmd/kprof.c
View file

@ -94,19 +94,25 @@ main(int argc, char *argv[])
exits(0); exits(0);
if (!textsym(&s, 0)) if (!textsym(&s, 0))
error(0, "no text symbols"); error(0, "no text symbols");
tbase = s.value & ~(mach->pgsize-1); /* align down to page */
print("KTZERO %.8llux\n", tbase); tbase = mach->kbase;
if(tbase != s.value & ~0xFFF)
print("warning: kbase %.8llux != tbase %.8llux\n",
tbase, s.value&~0xFFF);
print("KTZERO %.8llux PGSIZE %dKb\n", tbase, mach->pgsize/1024);
/* /*
* Accumulate counts for each function * Accumulate counts for each function
*/ */
cp = 0; cp = 0;
k = 0; k = 0;
for (i = 0, j = (s.value-tbase)/PCRES+2; j < n; i++) { for (i = 0, j = 2; j < n; i++) {
name = s.name; /* save name */ name = s.name; /* save name */
if (!textsym(&s, i)) /* get next symbol */ if (!textsym(&s, i)) /* get next symbol */
break; break;
s.value -= tbase;
s.value /= PCRES;
sum = 0; sum = 0;
while (j < n && j*PCRES < s.value-tbase) while (j < n && j < s.value)
sum += data[j++]; sum += data[j++];
if (sum) { if (sum) {
cp = realloc(cp, (k+1)*sizeof(struct COUNTER)); cp = realloc(cp, (k+1)*sizeof(struct COUNTER));

2
sys/src/libmach/8.c
View file

@ -68,7 +68,7 @@ Mach mi386 =
"setSB", /* static base register name (bogus anyways) */ "setSB", /* static base register name (bogus anyways) */
0, /* static base register value */ 0, /* static base register value */
0x1000, /* page size */ 0x1000, /* page size */
0x80100000ULL, /* kernel base */ 0xF0100000ULL, /* kernel base */
0xF0000000ULL, /* kernel text mask */ 0xF0000000ULL, /* kernel text mask */
0x7FFFFFFFULL, /* user stack top */ 0x7FFFFFFFULL, /* user stack top */
1, /* quantization of pc */ 1, /* quantization of pc */