summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/base')
-rw-r--r--src/base/SConscript2
-rw-r--r--src/base/addr_range.hh2
-rw-r--r--src/base/bigint.hh2
-rw-r--r--src/base/bmpwriter.cc2
-rw-r--r--src/base/circlebuf.hh2
-rw-r--r--src/base/debug.cc2
-rw-r--r--src/base/hostinfo.cc2
-rw-r--r--src/base/imgwriter.cc5
-rw-r--r--src/base/intmath.hh2
-rw-r--r--src/base/loader/ecoff_object.cc2
-rw-r--r--src/base/loader/elf_object.cc2
-rw-r--r--src/base/loader/object_file.hh2
-rw-r--r--src/base/loader/symtab.cc2
-rw-r--r--src/base/logging.cc (renamed from src/base/misc.cc)2
-rw-r--r--src/base/logging.hh (renamed from src/base/misc.hh)10
-rw-r--r--src/base/output.cc2
-rw-r--r--src/base/pngwriter.cc2
-rw-r--r--src/base/pollevent.cc2
-rw-r--r--src/base/random.cc2
-rw-r--r--src/base/socket.cc2
-rw-r--r--src/base/statistics.cc2
-rw-r--r--src/base/stats/text.cc2
-rw-r--r--src/base/time.cc2
-rw-r--r--src/base/trace.cc2
-rw-r--r--src/base/trie.hh2
-rw-r--r--src/base/vnc/vncinput.cc2
-rw-r--r--src/base/vnc/vncserver.cc2
27 files changed, 33 insertions, 32 deletions
diff --git a/src/base/SConscript b/src/base/SConscript
index 13c1ffff5..75759fd37 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -51,8 +51,8 @@ Source('hostinfo.cc')
Source('inet.cc')
Source('inifile.cc')
Source('intmath.cc')
+Source('logging.cc')
Source('match.cc')
-Source('misc.cc')
Source('output.cc')
Source('pollevent.cc')
Source('random.cc')
diff --git a/src/base/addr_range.hh b/src/base/addr_range.hh
index ac1cbd05a..b243d68aa 100644
--- a/src/base/addr_range.hh
+++ b/src/base/addr_range.hh
@@ -50,7 +50,7 @@
#include "base/bitfield.hh"
#include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
/**
diff --git a/src/base/bigint.hh b/src/base/bigint.hh
index 2fa441a73..a078fdd65 100644
--- a/src/base/bigint.hh
+++ b/src/base/bigint.hh
@@ -30,7 +30,7 @@
#include <iostream>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
#ifndef __BASE_BIGINT_HH__
diff --git a/src/base/bmpwriter.cc b/src/base/bmpwriter.cc
index f650074ab..02245c09d 100644
--- a/src/base/bmpwriter.cc
+++ b/src/base/bmpwriter.cc
@@ -44,7 +44,7 @@
#include <cassert>
-#include "base/misc.hh"
+#include "base/logging.hh"
const char* BmpWriter::_imgExtension = "bmp";
diff --git a/src/base/circlebuf.hh b/src/base/circlebuf.hh
index bf6f9e263..2c93daafc 100644
--- a/src/base/circlebuf.hh
+++ b/src/base/circlebuf.hh
@@ -44,7 +44,7 @@
#include <cassert>
#include <vector>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "sim/serialize.hh"
/**
diff --git a/src/base/debug.cc b/src/base/debug.cc
index 6be9cdff5..448268585 100644
--- a/src/base/debug.cc
+++ b/src/base/debug.cc
@@ -37,7 +37,7 @@
#include <csignal>
#include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
using namespace std;
diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc
index 43999a5e5..7ece35dd8 100644
--- a/src/base/hostinfo.cc
+++ b/src/base/hostinfo.cc
@@ -47,7 +47,7 @@
#include <cstring>
#include <string>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/str.hh"
#include "base/types.hh"
diff --git a/src/base/imgwriter.cc b/src/base/imgwriter.cc
index ba9b58c02..40de3d7cc 100644
--- a/src/base/imgwriter.cc
+++ b/src/base/imgwriter.cc
@@ -38,13 +38,14 @@
*/
#include "base/imgwriter.hh"
-#include "base/bmpwriter.hh"
-#include "base/misc.hh"
+#include "base/bmpwriter.hh"
+#include "base/logging.hh"
#include "config/use_png.hh"
#if USE_PNG
#include "base/pngwriter.hh"
+
#endif
std::unique_ptr<ImgWriter>
diff --git a/src/base/intmath.hh b/src/base/intmath.hh
index eded26d4a..0b22ba0db 100644
--- a/src/base/intmath.hh
+++ b/src/base/intmath.hh
@@ -33,7 +33,7 @@
#include <cassert>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
// Returns the prime number one less than n.
diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc
index 4e94ecd1e..caeab5f8f 100644
--- a/src/base/loader/ecoff_object.cc
+++ b/src/base/loader/ecoff_object.cc
@@ -33,7 +33,7 @@
#include <string>
#include "base/loader/symtab.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "base/types.hh"
#include "debug/Loader.hh"
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index fe43a7f01..60c79f803 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -54,7 +54,7 @@
#include "base/bitfield.hh"
#include "base/loader/symtab.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/Loader.hh"
#include "gelf.h"
diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh
index 80ffa91f6..c2cdafe47 100644
--- a/src/base/loader/object_file.hh
+++ b/src/base/loader/object_file.hh
@@ -35,7 +35,7 @@
#include <limits>
#include <string>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
class PortProxy;
diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index ea7332114..5c81c13e1 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -35,7 +35,7 @@
#include <string>
#include <vector>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/str.hh"
#include "base/types.hh"
#include "sim/serialize.hh"
diff --git a/src/base/misc.cc b/src/base/logging.cc
index be97368f3..cec9c8360 100644
--- a/src/base/misc.cc
+++ b/src/base/logging.cc
@@ -41,7 +41,7 @@
* Andreas Sandberg
*/
-#include "base/misc.hh"
+#include "base/logging.hh"
#include <array>
diff --git a/src/base/misc.hh b/src/base/logging.hh
index 7b0d46274..b0a9b0c1b 100644
--- a/src/base/misc.hh
+++ b/src/base/logging.hh
@@ -42,8 +42,8 @@
* Andreas Sandberg
*/
-#ifndef __BASE_MISC_HH__
-#define __BASE_MISC_HH__
+#ifndef __BASE_LOGGING_HH__
+#define __BASE_LOGGING_HH__
#include <cassert>
#include <cstdlib>
@@ -236,8 +236,8 @@ class Logger
} while (0)
/**
- * The chatty assert macro will function like a normal assert, but will allow the
- * specification of additional, helpful material to aid debugging why the
+ * The chatty assert macro will function like a normal assert, but will allow
+ * the specification of additional, helpful material to aid debugging why the
* assertion actually failed. Like the normal assertion, the chatty_assert
* will not be active in fast builds.
*
@@ -253,4 +253,4 @@ class Logger
panic("assert(" # cond ") failed: %s", csprintf(__VA_ARGS__)); \
} while (0)
#endif // NDEBUG
-#endif // __BASE_MISC_HH__
+#endif // __BASE_LOGGING_HH__
diff --git a/src/base/output.cc b/src/base/output.cc
index dc85c2a54..48581c3fe 100644
--- a/src/base/output.cc
+++ b/src/base/output.cc
@@ -58,7 +58,7 @@
#include <cstdlib>
#include <fstream>
-#include "base/misc.hh"
+#include "base/logging.hh"
using namespace std;
diff --git a/src/base/pngwriter.cc b/src/base/pngwriter.cc
index 3b49d479d..3251ac885 100644
--- a/src/base/pngwriter.cc
+++ b/src/base/pngwriter.cc
@@ -51,7 +51,7 @@ extern "C"
#include <cstdio>
#include <cstdlib>
-#include "base/misc.hh"
+#include "base/logging.hh"
const char* PngWriter::_imgExtension = "png";
diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc
index 79814e077..2101f8d71 100644
--- a/src/base/pollevent.cc
+++ b/src/base/pollevent.cc
@@ -45,7 +45,7 @@
#include <csignal>
#include <cstring>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
#include "sim/async.hh"
#include "sim/core.hh"
diff --git a/src/base/random.cc b/src/base/random.cc
index 0121581d6..1c6b1cb4a 100644
--- a/src/base/random.cc
+++ b/src/base/random.cc
@@ -46,7 +46,7 @@
#include <sstream>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "sim/serialize.hh"
Random::Random()
diff --git a/src/base/socket.cc b/src/base/socket.cc
index a09b51fb2..ece4a6ac4 100644
--- a/src/base/socket.cc
+++ b/src/base/socket.cc
@@ -38,7 +38,7 @@
#include <cerrno>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
#include "sim/byteswap.hh"
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index 96747f0a9..123351b80 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -40,7 +40,7 @@
#include "base/cprintf.hh"
#include "base/debug.hh"
#include "base/hostinfo.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/str.hh"
#include "base/time.hh"
#include "base/trace.hh"
diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index 9403ed3ff..10e94a770 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -52,7 +52,7 @@
#include <string>
#include "base/cast.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/stats/info.hh"
#include "base/str.hh"
diff --git a/src/base/time.cc b/src/base/time.cc
index 5509bccaf..6e9d7ccfb 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -35,7 +35,7 @@
#include <iostream>
#include <sstream>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "config/use_posix_clock.hh"
#include "sim/core.hh"
#include "sim/serialize.hh"
diff --git a/src/base/trace.cc b/src/base/trace.cc
index dfd99686a..06f9eeb21 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -42,7 +42,7 @@
#include <string>
#include "base/debug.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/output.hh"
#include "base/str.hh"
diff --git a/src/base/trie.hh b/src/base/trie.hh
index 1d110b4e1..e256377c1 100644
--- a/src/base/trie.hh
+++ b/src/base/trie.hh
@@ -34,7 +34,7 @@
#include <cassert>
#include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
// Key has to be an integral type.
diff --git a/src/base/vnc/vncinput.cc b/src/base/vnc/vncinput.cc
index b9d1d2546..da3c913b2 100644
--- a/src/base/vnc/vncinput.cc
+++ b/src/base/vnc/vncinput.cc
@@ -46,7 +46,7 @@
#include <sys/types.h>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/output.hh"
#include "base/trace.hh"
diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc
index 00ff5602f..97515ac16 100644
--- a/src/base/vnc/vncserver.cc
+++ b/src/base/vnc/vncserver.cc
@@ -64,7 +64,7 @@
#include <cstdio>
#include "base/atomicio.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/output.hh"
#include "base/socket.hh"
#include "base/trace.hh"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 07:49:41 +0000