summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2018-10-03 18:13:51 -0400
committerFrans Kaashoek <[email protected]>2018-10-03 18:13:51 -0400
commiteb72653bd7a1dec89a79af3c377c3abf8df2064a (patch)
tree007d7be05f735de83c47d8ba9cfe66d563c63914 /proc.c
parent23a58370a4fa441fd0ee152a3e1e7619e5d8bd6b (diff)
downloadxv6-labs-eb72653bd7a1dec89a79af3c377c3abf8df2064a.tar.gz
xv6-labs-eb72653bd7a1dec89a79af3c377c3abf8df2064a.tar.bz2
xv6-labs-eb72653bd7a1dec89a79af3c377c3abf8df2064a.zip
use x86-64 names
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/proc.c b/proc.c
index 3ab23f4..4d0faec 100644
--- a/proc.c
+++ b/proc.c
@@ -118,7 +118,7 @@ found:
sp -= sizeof *p->context;
p->context = (struct context*)sp;
memset(p->context, 0, sizeof *p->context);
- p->context->eip = (uint64)forkret;
+ p->context->rip = (uint64)forkret;
return p;
}
@@ -531,7 +531,7 @@ procdump(void)
state = "???";
cprintf("%d %s %s", p->pid, state, p->name);
if(p->state == SLEEPING){
- getcallerpcs((uint64*)p->context->ebp+2, pc);
+ getcallerpcs((uint64*)p->context->rbp+2, pc);
for(i=0; i<10 && pc[i] != 0; i++)
cprintf(" %p", pc[i]);
}