diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2005-12-23 13:32:31 -0500 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2005-12-23 13:32:31 -0500 |
| commit | 0cdcb08d908bc20f614dd164f8e43287406e81a3 (patch) | |
| tree | ba6da1e59f9ca5c67c9aa067f374c77129722a52 /sim | |
| parent | 627f540e3119e09747005e208daa8153b22d9967 (diff) | |
| download | gem5-0cdcb08d908bc20f614dd164f8e43287406e81a3.tar.xz | |
Change base/intmath.{cc,hh} to follow m5 style.
arch/alpha/alpha_tru64_process.cc:
base/intmath.hh:
base/statistics.cc:
base/str.cc:
cpu/o3/btb.cc:
sim/process.cc:
sim/syscall_emul.hh:
Rename intmath.hh functions to follow m5 style
(RoundUp -> roundUp, etc.).
base/intmath.cc:
Rename intmath.hh functions to follow m5 style
(RoundUp -> roundUp, etc.).
Also reindent code in m5 style.
--HG--
extra : convert_revision : 57b853002bc3c9911e122599d9062b41a06d8e6a
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/process.cc | 2 | ||||
| -rw-r--r-- | sim/syscall_emul.hh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sim/process.cc b/sim/process.cc index a6cf5ded7..28bc5ac3b 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -274,7 +274,7 @@ LiveProcess::LiveProcess(const string &nm, ObjectFile *objFile, text_size = objFile->textSize(); data_base = objFile->dataBase(); data_size = objFile->dataSize() + objFile->bssSize(); - brk_point = RoundUp<uint64_t>(data_base + data_size, VMPageSize); + brk_point = roundUp<uint64_t>(data_base + data_size, VMPageSize); // load object file into target memory objFile->loadSections(memory); diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh index 2bd8969d7..c535b5ad6 100644 --- a/sim/syscall_emul.hh +++ b/sim/syscall_emul.hh @@ -634,7 +634,7 @@ mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc) if (start == 0) { // user didn't give an address... pick one from our "mmap region" start = p->mmap_end; - p->mmap_end += RoundUp<Addr>(length, VMPageSize); + p->mmap_end += roundUp<Addr>(length, VMPageSize); if (p->nxm_start != 0) { //If we have an nxm space, make sure we haven't colided assert(p->mmap_end < p->nxm_start); |