diff options
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/prog.cc | 3 | ||||
| -rw-r--r-- | sim/sim_events.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sim/prog.cc b/sim/prog.cc index 355e8d0a1..0c9191d5d 100644 --- a/sim/prog.cc +++ b/sim/prog.cc @@ -36,6 +36,7 @@ #include "prog.hh" #include "eio.hh" +#include "intmath.hh" #include "thread.hh" #include "fake_syscall.hh" #include "object_file.hh" @@ -251,7 +252,7 @@ LiveProcess::LiveProcess(const string &name, text_size = objFile->textSize(); data_base = objFile->dataBase(); data_size = objFile->dataSize() + objFile->bssSize(); - brk_point = ROUND_UP(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/sim_events.cc b/sim/sim_events.cc index ffabc3006..8a2481484 100644 --- a/sim/sim_events.cc +++ b/sim/sim_events.cc @@ -30,6 +30,7 @@ #include "cpu.hh" #include "eventq.hh" +#include "hostinfo.hh" #include "sim_events.hh" #include "sim_exit.hh" #include "sim_stats.hh" @@ -122,7 +123,7 @@ CheckSwapEvent::process() long swap; /* returns free swap in KBytes */ - swap = proc_info("/proc/meminfo", "SwapFree:"); + swap = procInfo("/proc/meminfo", "SwapFree:"); if (swap < 1000) ccprintf(cerr, "\a\a\aWarning! Swap space is low (%d)\n", swap); |