Get rid of the gross operator,()/variadic macro hack

that made ccprintf and friends work, turn it into a
normal function (though it still has a slightly strange
implementation.)  All instances of variadic macros
are not yet removed, but I know how, and it will happen.

One side effect of this new implementation is that a
cprintf statement can now only have 16 parameters, though
it's easy enough to raise this number if needed.

--HG--
extra : convert_revision : 85cb3c17f8e2ecf9cd2f31ea80a760a28ea127a7

1 files changed, 44 insertions, 27 deletions

diff --git a/src/base/misc.hh b/src/base/misc.hh
index c12c2fe20..1509ea2d2 100644
--- a/src/base/misc.hh
+++ b/src/base/misc.hh
@@ -32,9 +32,11 @@
 #ifndef __MISC_HH__
 #define __MISC_HH__
 
-#include <assert.h>
+#include <cassert>
+
 #include "base/compiler.hh"
 #include "base/cprintf.hh"
+#include "base/varargs.hh"
 
 #if defined(__SUNPRO_CC)
 #define __FUNCTION__ "how to fix me?"
@@ -47,14 +49,20 @@
 // calls abort which can dump core or enter the debugger.
 //
 //
-void __panic(const std::string&, cp::ArgList &, const char*, const char*, int)
-    M5_ATTR_NORETURN;
-#define __panic__(format, ...) \
-    __panic(format, (*(new cp::ArgList), __VA_ARGS__), \
-        __FUNCTION__ , __FILE__, __LINE__)
-#define panic(...) \
-    __panic__(__VA_ARGS__, cp::ArgListNull())
+void __panic(const char *func, const char *file, int line, const char *format,
+             CPRINTF_DECLARATION) M5_ATTR_NORETURN;
+void __panic(const char *func, const char *file, int line,
+             const std::string &format, CPRINTF_DECLARATION)
+M5_ATTR_NORETURN;
+
+inline void
+__panic(const char *func, const char *file, int line,
+        const std::string &format, CPRINTF_DEFINITION)
+{
+    __panic(func, file, line, format.c_str(), VARARGS_ALLARGS);
+}
 M5_PRAGMA_NORETURN(__panic)
+#define panic(...) __panic(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
 //
 // This implements a cprintf based fatal() function.  fatal() should
@@ -64,34 +72,43 @@ M5_PRAGMA_NORETURN(__panic)
 // "normal" exit with an error code, as opposed to abort() like
 // panic() does.
 //
-void __fatal(const std::string&, cp::ArgList &, const char*, const char*, int)
+void __fatal(const char *func, const char *file, int line, const char *format,
+             CPRINTF_DECLARATION) M5_ATTR_NORETURN;
+void __fatal(const char *func, const char *file, int line,
+             const std::string &format, CPRINTF_DECLARATION)
     M5_ATTR_NORETURN;
-#define __fatal__(format, ...) \
-    __fatal(format, (*(new cp::ArgList), __VA_ARGS__), \
-        __FUNCTION__ , __FILE__, __LINE__)
-#define fatal(...) \
-    __fatal__(__VA_ARGS__, cp::ArgListNull())
+
+inline void
+__fatal(const char *func, const char *file, int line,
+        const std::string &format, CPRINTF_DEFINITION)
+{
+    __fatal(func, file, line, format.c_str(), VARARGS_ALLARGS);
+}
 M5_PRAGMA_NORETURN(__fatal)
+#define fatal(...) __fatal(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
 //
 // This implements a cprintf based warn
 //
-void __warn(const std::string&, cp::ArgList &, const char*, const char*, int);
-#define __warn__(format, ...) \
-    __warn(format, (*(new cp::ArgList), __VA_ARGS__), \
-           __FUNCTION__ , __FILE__, __LINE__)
-#define warn(...) \
-    __warn__(__VA_ARGS__, cp::ArgListNull())
+void __warn(const char *func, const char *file, int line, const char *format,
+            CPRINTF_DECLARATION);
+inline void
+__warn(const char *func, const char *file, int line, const std::string &format,
+       CPRINTF_DECLARATION)
+{
+    __warn(func, file, line, format, VARARGS_ALLARGS);
+}
+#define warn(...) __warn(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
 // Only print the warning message the first time it is seen.  This
 // doesn't check the warning string itself, it just only lets one
 // warning come from the statement. So, even if the arguments change
 // and that would have resulted in a different warning message,
 // subsequent messages would still be supressed.
-#define warn_once(...) do {                     \
+#define warn_once(...) do {                         \
         static bool once = false;                   \
         if (!once) {                                \
-            __warn__(__VA_ARGS__, cp::ArgListNull());      \
+            warn(__VA_ARGS__);                       \
             once = true;                            \
         }                                           \
     } while (0)
@@ -99,10 +116,10 @@ void __warn(const std::string&, cp::ArgList &, const char*, const char*, int);
 //
 // assert() that prints out the current cycle
 //
-#define m5_assert(TEST) \
-   if (!(TEST)) { \
-     std::cerr << "Assertion failure, curTick = " << curTick << std::endl; \
-   } \
-   assert(TEST);
+#define m5_assert(TEST) do {                                            \
+    if (!(TEST))                                                        \
+        ccprintf(std::cerr, "Assertion failure, curTick = %d\n", curTick); \
+    assert(TEST);                                                       \
+} while (0)
 
 #endif // __MISC_HH__