From 311479ceb74ecfed110cda4d07ac564fc4364ed2 Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Wed, 10 Aug 2022 06:41:00 -0400 Subject: [PATCH 1/3] put walk() in defs.h so it's clear students can call it --- kernel/defs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/defs.h b/kernel/defs.h index 049569e..62b9292 100644 --- a/kernel/defs.h +++ b/kernel/defs.h @@ -166,6 +166,7 @@ int uvmcopy(pagetable_t, pagetable_t, uint64); void uvmfree(pagetable_t, uint64); void uvmunmap(pagetable_t, uint64, uint64, int); void uvmclear(pagetable_t, uint64); +pte_t * walk(pagetable_t, uint64, int); uint64 walkaddr(pagetable_t, uint64); int copyout(pagetable_t, uint64, char *, uint64); int copyin(pagetable_t, char *, uint64, uint64); From c3a17f454a135dd1fc694ce8b203dda1233c341e Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Wed, 10 Aug 2022 06:42:17 -0400 Subject: [PATCH 2/3] have sh print prompt with write, not printf, to make system call lecture a little clearer. --- user/sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/sh.c b/user/sh.c index 36245b3..864405d 100644 --- a/user/sh.c +++ b/user/sh.c @@ -134,7 +134,7 @@ runcmd(struct cmd *cmd) int getcmd(char *buf, int nbuf) { - fprintf(2, "$ "); + write(1, "$ ", 2); memset(buf, 0, nbuf); gets(buf, nbuf); if(buf[0] == 0) // EOF From e606f95459c6e1ce6d44de6c0f2d5c5fc4f74eb5 Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Wed, 10 Aug 2022 07:06:49 -0400 Subject: [PATCH 3/3] x --- user/sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/sh.c b/user/sh.c index 864405d..836ebcb 100644 --- a/user/sh.c +++ b/user/sh.c @@ -134,7 +134,7 @@ runcmd(struct cmd *cmd) int getcmd(char *buf, int nbuf) { - write(1, "$ ", 2); + write(2, "$ ", 2); memset(buf, 0, nbuf); gets(buf, nbuf); if(buf[0] == 0) // EOF