diff options
| author | Robert Morris <[email protected]> | 2020-07-17 16:29:52 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2020-08-10 11:19:10 -0400 |
| commit | 5494c9170587b17c9d749e19753fa3e7fb6958b9 (patch) | |
| tree | 610285e7a543272daaea525dd3eeada3ce7e6735 /kernel/exec.c | |
| parent | 82981fab6bbd36dc0ff24201a11d365c4a2c6b1d (diff) | |
| download | xv6-labs-5494c9170587b17c9d749e19753fa3e7fb6958b9.tar.gz xv6-labs-5494c9170587b17c9d749e19753fa3e7fb6958b9.tar.bz2 xv6-labs-5494c9170587b17c9d749e19753fa3e7fb6958b9.zip | |
rename p->tf to p->trapframe, for consistency with p->context
Diffstat (limited to 'kernel/exec.c')
| -rw-r--r-- | kernel/exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/exec.c b/kernel/exec.c index 6a51499..1077ac0 100644 --- a/kernel/exec.c +++ b/kernel/exec.c @@ -97,7 +97,7 @@ exec(char *path, char **argv) // arguments to user main(argc, argv) // argc is returned via the system call return // value, which goes in a0. - p->tf->a1 = sp; + p->trapframe->a1 = sp; // Save program name for debugging. for(last=s=path; *s; s++) @@ -109,8 +109,8 @@ exec(char *path, char **argv) oldpagetable = p->pagetable; p->pagetable = pagetable; p->sz = sz; - p->tf->epc = elf.entry; // initial program counter = main - p->tf->sp = sp; // initial stack pointer + p->trapframe->epc = elf.entry; // initial program counter = main + p->trapframe->sp = sp; // initial stack pointer proc_freepagetable(oldpagetable, oldsz); return argc; // this ends up in a0, the first argument to main(argc, argv) |