Stop using omisc.h and move relevant functions to better places

while converting them to C++

base/intmath.hh:
    Add some functions that were previously defined elsewhere in C
base/misc.cc:
    Use the C++ version of memUsage, and sort #includes
sim/prog.cc:
    Stop using the old macro versions of various functions and use
    the new ones defined in intmath.hh
sim/sim_events.cc:
    Stop using the old C versions of various functions and use
    the new ones defined in hostinfo.hh

--HG--
extra : convert_revision : 15d1f24d2aff4254c745eea6070cb230dd37b8d2

1 files changed, 2 insertions, 1 deletions

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);