Changeset 22 for sources/src/sc_int.h

Timestamp:

Apr 16, 2009, 2:46:01 PM (15 years ago)

Author:

buchmann

Message:

Fix:

• add missing system header include
• add a namespace path to atoi

And... code cleanup:

• bunch of various operators that share the same implementation now are using the same #define.
• indent and tab/space

File:

• sources/src/sc_int.h (modified) (3 diffs)

sources/src/sc_int.h

@@ -18 +18 @@
 #include <sc_logic.h>
 #include <sc_bv.h>
+#include <cstdlib>
 
 // ----------------------------------------------------------------------------
@@ -135 +136 @@
   sc_int()                 { val = 0; }
 //  sc_int(data_type val_)  { val = 0; write (val_); }
-  sc_int (const char *a)   { val = 0; write (atoi (a)); }
+  sc_int (const char *a)   { val = 0; write (std::atoi (a)); }
   sc_int (unsigned short a){ val = 0; write (a); }
   sc_int (short a)         { val = 0; write (a); }
@@ -197 +198 @@
 
   // arithmetic
-  template <typename T>
-  inline sc_int& operator <<= (T v)
-  { vf.valW <<= v; return *this; }
-  template <typename T>
-  inline sc_int& operator >>= (T v)
-  { vf.valW >>= v; return *this; }
-  template <typename T>
-  inline sc_int& operator += (T v)
-  { vf.valW += v; return *this; }
-  template <typename T>
-  inline sc_int& operator -= (T v)
-  { vf.valW -= v; return *this; }
-  template <typename T>
-  inline sc_int& operator *= (T v)
-  { vf.valW *= v; return *this; }
-  template <typename T>
-  inline sc_int& operator /= (T v)
-  { vf.valW /= v; return *this; }
-  template <typename T>
-  inline sc_int& operator %= (T v)
-  { vf.valW %= v; return *this; }
-  template <typename T>
-  inline sc_int& operator &= (T v)
-  { vf.valW &= v; return *this; }
-  template <typename T>
-  inline sc_int& operator |= (T v)
-  { vf.valW |= v; return *this; }
-  template <typename T>
-  inline sc_int& operator ^= (T v)
-  { vf.valW ^= v; return *this; }
+#define DEFINE_OPERATOR(OPER)        \
+  template <typename T>              \
+  inline sc_int& operator OPER (T v) \
+  { vf.valW OPER v; return *this; }
+
+  DEFINE_OPERATOR(<<=)
+  DEFINE_OPERATOR(>>=)
+  DEFINE_OPERATOR(+=)
+  DEFINE_OPERATOR(-=)
+  DEFINE_OPERATOR(*=)
+  DEFINE_OPERATOR(/=)
+  DEFINE_OPERATOR(%=)
+  DEFINE_OPERATOR(&=)
+  DEFINE_OPERATOR(|=)
+  DEFINE_OPERATOR(^=)
+#undef DEFINE_OPERATOR
+
   inline sc_int_bit_ref& operator [] (int v)
   { return (vf.valW >> v) & 1; }