summaryrefslogtreecommitdiff
path: root/umalloc.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-08-25 00:43:17 +0000
committerkaashoek <kaashoek>2006-08-25 00:43:17 +0000
commit74493bf4460f4024e06760289735e9d5dcb9dc3f (patch)
tree57beb4206294c5ae4c10569eac1333470b212a68 /umalloc.c
parent81d521999844f1dfa9c419463bbb8e355817062a (diff)
downloadxv6-labs-74493bf4460f4024e06760289735e9d5dcb9dc3f.tar.gz
xv6-labs-74493bf4460f4024e06760289735e9d5dcb9dc3f.tar.bz2
xv6-labs-74493bf4460f4024e06760289735e9d5dcb9dc3f.zip
kill user process when it generates an unhandled trap (e.g., 13)
fix bug in test code of malloc
Diffstat (limited to 'umalloc.c')
-rw-r--r--umalloc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/umalloc.c b/umalloc.c
index 11d816a..cdf099e 100644
--- a/umalloc.c
+++ b/umalloc.c
@@ -26,8 +26,6 @@ free(void *ap)
{
Header *bp, *p;
- printf(1, "free\n");
-
bp = (Header *) ap - 1;
for (p = freep; !(bp > p && bp < p->s.ptr); p = p->s.ptr)
if (p >= p->s.ptr && (bp > p || bp < p->s.ptr))
@@ -53,7 +51,6 @@ morecore(uint nu)
if (nu < PAGE)
nu = PAGE;
- printf(1, "call sbrk\n");
cp = sbrk(nu * sizeof(Header));
if (cp == (char *) -1)
return 0;
@@ -69,8 +66,6 @@ malloc(uint nbytes)
Header *p, *prevp;
uint nunits;
- printf(1, "malloc %d\n", nbytes);
-
nunits = (nbytes + sizeof(Header) - 1)/sizeof(Header) + 1;
if ((prevp = freep) == 0) {
base.s.ptr = freep = prevp = &base;
@@ -86,7 +81,6 @@ malloc(uint nbytes)
p->s.size = nunits;
}
freep = prevp;
- printf(1, "malloc returns: %d\n", (int) (p+1));
return (void *) (p + 1);
}
if (p == freep)