summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorAndrew Schultz <alschult@umich.edu>2004-02-13 16:42:42 -0500
committerAndrew Schultz <alschult@umich.edu>2004-02-13 16:42:42 -0500
commit6391bfac543921e49469d74ea58de644d7a8f7cc (patch)
tree5eecd8fdf50590c9b8d8a622b90fff0c6ff2aff1 /sim
parent29eae76153c325e1b16785e65381075eaeaa7d3b (diff)
parent8232c9743df13416810316476500d0e13681677e (diff)
downloadgem5-6391bfac543921e49469d74ea58de644d7a8f7cc.tar.xz
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/alschult/linux --HG-- extra : convert_revision : 2ea2bbd41f7e0c257b374d9cd0e37abaf6a7c170
Diffstat (limited to 'sim')
-rw-r--r--sim/syscall_emul.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sim/syscall_emul.cc b/sim/syscall_emul.cc
index e953a7308..57ae39cf8 100644
--- a/sim/syscall_emul.cc
+++ b/sim/syscall_emul.cc
@@ -104,7 +104,9 @@ int
obreakFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc)
{
// change brk addr to first arg
- p->brk_point = xc->getSyscallArg(0);
+ Addr new_brk = xc->getSyscallArg(0);
+ if (new_brk != 0)
+ p->brk_point = xc->getSyscallArg(0);
return p->brk_point;
}