Unify Bitmask::Signature with BitmaskSig.

diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp
index b7694f46f79f5753d1c19d34f287093238e37341..865f9ae5254133f3b42cdd4327c08baa687d980c 100644 (file)
--- a/gui/apitracecall.cpp
+++ b/gui/apitracecall.cpp
@@ -164,8 +164,8 @@ void ApiBitmask::init(const Trace::Bitmask *bitmask)
         return;
 
     m_value = bitmask->value;
-    for (Trace::Bitmask::Signature::const_iterator it = bitmask->sig->begin();
-         it != bitmask->sig->end(); ++it) {
+    for (const Trace::BitmaskVal *it = bitmask->sig->values;
+         it != bitmask->sig->values + bitmask->sig->count; ++it) {
         assert(it->value);
         QPair<QString, unsigned long long> pair;
 

diff --git a/trace_model.cpp b/trace_model.cpp
index 0d2915f01926c5bd3090373d12be43906e862db7..03f633b4cf33b47c114b11c6c24a9905dc86a132 100644 (file)
--- a/trace_model.cpp
+++ b/trace_model.cpp
@@ -255,9 +255,9 @@ public:
 
     void visit(Bitmask *bitmask) {
         unsigned long long value = bitmask->value;
-        const Bitmask::Signature *sig = bitmask->sig;
+        const BitmaskSig *sig = bitmask->sig;
         bool first = true;
-        for (Bitmask::Signature::const_iterator it = sig->begin(); value != 0 && it != sig->end(); ++it) {
+        for (const BitmaskVal *it = sig->values; value != 0 && it != sig->values + sig->count; ++it) {
             if ((it->value && (value & it->value) == it->value) ||
                 (!it->value && value == 0)) {
                 if (!first) {

diff --git a/trace_model.hpp b/trace_model.hpp
index a942ac99cd529281269304c84e23ad7040cbae9c..6560346368f4955fe670cc52f960045ea6553b7a 100644 (file)
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -192,13 +192,11 @@ public:
 class Bitmask : public UInt
 {
 public:
-    typedef std::vector<BitmaskVal> Signature;
-
-    Bitmask(const Signature *_sig, unsigned long long _value) : UInt(_value), sig(_sig) {}
+    Bitmask(const BitmaskSig *_sig, unsigned long long _value) : UInt(_value), sig(_sig) {}
 
     void visit(Visitor &visitor);
 
-    const Signature *sig;
+    const BitmaskSig *sig;
 };
 
 

diff --git a/trace_parser.cpp b/trace_parser.cpp
index 17682bd2a1ebad840613ebea90ab1b6890466931..77bdd1f46f1b870719e3d049887956a12439ff24 100644 (file)
--- a/trace_parser.cpp
+++ b/trace_parser.cpp
@@ -323,17 +323,21 @@ Value *Parser::parse_enum() {
 
 Value *Parser::parse_bitmask() {
     size_t id = read_uint();
-    Bitmask::Signature *sig = lookup(bitmasks, id);
+    BitmaskSig *sig = lookup(bitmasks, id);
     if (!sig) {
-        size_t size = read_uint();
-        sig = new Bitmask::Signature(size);
-        for (Bitmask::Signature::iterator it = sig->begin(); it != sig->end(); ++it) {
+        size_t count = read_uint();
+        BitmaskVal *values = new BitmaskVal[count];
+        for (BitmaskVal *it = values; it != values + count; ++it) {
             it->name = read_string();
             it->value = read_uint();
-            if (it->value == 0 && it != sig->begin()) {
+            if (it->value == 0 && it != values) {
                 std::cerr << "warning: bitmask " << it->name << " is zero but is not first flag\n";
             }
         }
+        sig = new BitmaskSig;
+        sig->id = id;
+        sig->count = count;
+        sig->values = values;
         bitmasks[id] = sig;
     }
     assert(sig);

diff --git a/trace_parser.hpp b/trace_parser.hpp
index c9f92fc8877a054f9f03ee7a98f36554cd52bf4f..634cb59bc8a9bfdf921fb74ea4f03b8f330de9e5 100644 (file)
--- a/trace_parser.hpp
+++ b/trace_parser.hpp
@@ -54,7 +54,7 @@ protected:
     typedef std::vector<Enum::Signature *> EnumMap;
     EnumMap enums;
 
-    typedef std::vector<Bitmask::Signature *> BitmaskMap;
+    typedef std::vector<BitmaskSig *> BitmaskMap;
     BitmaskMap bitmasks;
 
     unsigned next_call_no;