diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-21 12:03:22 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-21 12:03:22 -0700 |
| commit | eff122797b5bc735c6d7c797be691c0fa02032e3 (patch) | |
| tree | 1dd1cef3b2b4e044fece9a406cd0ce97d09a2da7 /src/arch/x86/process.cc | |
| parent | 83af0fdcf57175adf8077c51e9ba872dd2c04b76 (diff) | |
| parent | 5195500cdf7dc99b5367f91387eef4e9f5b65bfe (diff) | |
| download | gem5-eff122797b5bc735c6d7c797be691c0fa02032e3.tar.xz | |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
--HG--
extra : convert_revision : 9002940097a166c8442ae1adf41b974227968920
Diffstat (limited to 'src/arch/x86/process.cc')
| -rw-r--r-- | src/arch/x86/process.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc index af7494598..7deb54945 100644 --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -268,7 +268,6 @@ X86LiveProcess::argsInit(int intSize, int pageSize) int argv_array_size = intSize * (argv.size() + 1); int argc_size = intSize; - int window_save_size = intSize * 16; int space_needed = mysterious_size + @@ -276,8 +275,7 @@ X86LiveProcess::argsInit(int intSize, int pageSize) aux_array_size + envp_array_size + argv_array_size + - argc_size + - window_save_size; + argc_size; stack_min = stack_base - space_needed; stack_min &= alignmentMask; @@ -296,10 +294,6 @@ X86LiveProcess::argsInit(int intSize, int pageSize) Addr envp_array_base = auxv_array_base - envp_array_size; Addr argv_array_base = envp_array_base - argv_array_size; Addr argc_base = argv_array_base - argc_size; -#ifndef NDEBUG - // only used in DPRINTF - Addr window_save_base = argc_base - window_save_size; -#endif DPRINTF(X86, "The addresses of items on the initial stack:\n"); DPRINTF(X86, "0x%x - file name\n", file_name_base); @@ -309,7 +303,6 @@ X86LiveProcess::argsInit(int intSize, int pageSize) DPRINTF(X86, "0x%x - envp array\n", envp_array_base); DPRINTF(X86, "0x%x - argv array\n", argv_array_base); DPRINTF(X86, "0x%x - argc \n", argc_base); - DPRINTF(X86, "0x%x - window save\n", window_save_base); DPRINTF(X86, "0x%x - stack min\n", stack_min); // write contents to stack |