Make windows build user friendlier.

[apitrace] / trace_parser.cpp

diff --git a/trace_parser.cpp b/trace_parser.cpp
index e615ed7aa65bd9c4f861924cbc85ddee94483beb..1d3c08ad62e0561da4fe2df60a6df36c2305fa1a 100644 (file)
--- a/trace_parser.cpp
+++ b/trace_parser.cpp
@@ -137,14 +137,17 @@ T *lookup(std::vector<T *> &map, size_t index) {
 void Parser::parse_enter(void) {
     size_t id = read_uint();
 
-    Call::Signature *sig = lookup(functions, id);
+    FunctionSig *sig = lookup(functions, id);
     if (!sig) {
-        sig = new Call::Signature;
+        sig = new FunctionSig;
+        sig->id = id;
         sig->name = read_string();
-        unsigned size = read_uint();
-        for (unsigned i = 0; i < size; ++i) {
-            sig->arg_names.push_back(read_string());
+        sig->num_args = read_uint();
+        const char **arg_names = new const char *[sig->num_args];
+        for (unsigned i = 0; i < sig->num_args; ++i) {
+            arg_names[i] = read_string();
         }
+        sig->arg_names = arg_names;
         functions[id] = sig;
     }
     assert(sig);
@@ -309,11 +312,14 @@ Value *Parser::parse_string() {
 
 Value *Parser::parse_enum() {
     size_t id = read_uint();
-    Enum::Signature *sig = lookup(enums, id);
+    EnumSig *sig = lookup(enums, id);
     if (!sig) {
-        const char *name = read_string();
+        sig = new EnumSig;
+        sig->id = id;
+        sig->name = read_string();
         Value *value = parse_value();
-        sig = new Enum::Signature(name, value);
+        sig->value = value->toSInt();
+        delete value;
         enums[id] = sig;
     }
     assert(sig);
@@ -323,17 +329,20 @@ 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) {
-            it->first = read_string();
-            it->second = read_uint();
-            if (it->second == 0 && it != sig->begin()) {
-                std::cerr << "warning: bitmask " << it->first << " is zero but is not first flag\n";
+        sig = new BitmaskSig;
+        sig->id = id;
+        sig->num_flags = read_uint();
+        BitmaskFlag *flags = new BitmaskFlag[sig->num_flags];
+        for (BitmaskFlag *it = flags; it != flags + sig->num_flags; ++it) {
+            it->name = read_string();
+            it->value = read_uint();
+            if (it->value == 0 && it != flags) {
+                std::cerr << "warning: bitmask " << it->name << " is zero but is not first flag\n";
             }
         }
+        sig->flags = flags;
         bitmasks[id] = sig;
     }
     assert(sig);
@@ -367,21 +376,24 @@ Value *Parser::parse_blob(void) {
 Value *Parser::parse_struct() {
     size_t id = read_uint();
 
-    Struct::Signature *sig = lookup(structs, id);
+    StructSig *sig = lookup(structs, id);
     if (!sig) {
-        sig = new Struct::Signature;
+        sig = new StructSig;
+        sig->id = id;
         sig->name = read_string();
-        unsigned size = read_uint();
-        for (unsigned i = 0; i < size; ++i) {
-            sig->member_names.push_back(read_string());
+        sig->num_members = read_uint();
+        const char **member_names = new const char *[sig->num_members];
+        for (unsigned i = 0; i < sig->num_members; ++i) {
+            member_names[i] = read_string();
         }
+        sig->member_names = member_names;
         structs[id] = sig;
     }
     assert(sig);
 
     Struct *value = new Struct(sig);
 
-    for (size_t i = 0; i < sig->member_names.size(); ++i) {
+    for (size_t i = 0; i < sig->num_members; ++i) {
         value->members[i] = parse_value();
     }