X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace_parser.hpp;h=4fff9ad1157129e0da8458f8cca87e68687197ec;hb=51fade4dcdd16dd03e5fc28e5a63cb5f8a95aa28;hp=50f315caa2ff982014b2cbaf4a7294531ec92619;hpb=7e329020a9dc8e0201f3ebe256b5ddbacd57dcc3;p=apitrace

diff --git a/trace_parser.hpp b/trace_parser.hpp
index 50f315c..4fff9ad 100644
--- a/trace_parser.hpp
+++ b/trace_parser.hpp
@@ -27,11 +27,8 @@
 #define _TRACE_PARSER_HPP_
 
 
-#include <cassert>
-
 #include <iostream>
-
-#include <zlib.h>
+#include <list>
 
 #include "trace_format.hpp"
 #include "trace_model.hpp"
@@ -39,212 +36,81 @@
 
 namespace Trace {
 
+class File;
 
 class Parser
 {
 protected:
-   gzFile file;
+    File *file;
+
+    typedef std::list<Call *> CallList;
+    CallList calls;
+
+    typedef std::vector<FunctionSig *> FunctionMap;
+    FunctionMap functions;
+
+    typedef std::vector<StructSig *> StructMap;
+    StructMap structs;
+
+    typedef std::vector<EnumSig *> EnumMap;
+    EnumMap enums;
+
+    typedef std::vector<BitmaskSig *> BitmaskMap;
+    BitmaskMap bitmasks;
+
+    unsigned next_call_no;
+
 public:
-   Parser() {
-      file = NULL;
-   }
-
-   bool parse(const char *filename) {
-      unsigned long long version;
-
-      file = gzopen(filename, "rb");
-      if (!file) {
-         return false;
-      }
-
-      version = read_uint();
-      if (version != TRACE_VERSION) {
-         std::cerr << "Unsupported format version" << version << "\n";
-         return false;
-      }
-
-      while (!gzeof(file)) {
-         parse_call();
-      }
-
-      return true;
-   }
-
-   void parse_call(void) {
-      Call call;
-      call.name = read_string();
-      int c;
-      do {
-         c = gzgetc(file);
-         if (c == Trace::CALL_END || c == -1) {
-            break;
-         }
-         switch(c) {
-         case Trace::CALL_END:
-            return;
-         case Trace::CALL_ARG:
-            call.args.push_back(parse_arg());
-            break;
-         case Trace::CALL_RET:
-            call.ret = parse_value();
-            break;
-         default:
-            assert(0);
-            std::cerr << "Unknown call detail " << c << "\n";
-            break;
-         }
-      } while(true);
-      handle_call(call);
-   }
-   
-   virtual void handle_call(Call &call) {
-      std::cout << call;
-   }
-
-   Arg parse_arg(void) {
-      std::string name = read_string();
-      Value *value = parse_value();
-      return Arg(name, value);
-   }
-   
-   Value *parse_value(void) {
-      int c;
-      c = gzgetc(file);
-      switch(c) {
-      case Trace::TYPE_BOOL:
-         return parse_bool();
-      case Trace::TYPE_SINT:
-         return parse_sint();
-      case Trace::TYPE_UINT:
-         return parse_uint();
-      case Trace::TYPE_FLOAT:
-         return parse_float();
-      case Trace::TYPE_DOUBLE:
-         return parse_double();
-      case Trace::TYPE_STRING:
-         return parse_string();
-      case Trace::TYPE_CONST:
-         return parse_const();
-      case Trace::TYPE_BITMASK:
-         return parse_bitmask();
-      case Trace::TYPE_ARRAY:
-         return parse_array();
-      case Trace::TYPE_POINTER:
-         return parse_pointer();
-      case Trace::TYPE_VOID:
-         return NULL;
-      default:
-         std::cerr << "Unknown type " << c << "\n";
-         assert(0);
-         return NULL;
-      }
-   }
-
-   Value *parse_bool() {
-      int c;
-      c = gzgetc(file);
-      return new Bool(c);
-   }
-   
-   Value *parse_sint() {
-      return new SInt(-read_uint());
-   }
-   
-   Value *parse_uint() {
-      return new UInt(read_uint());
-   }
-   
-   Value *parse_float() {
-      float value;
-      gzread(file, &value, sizeof value);
-      return new Float(value);
-   }
-   
-   Value *parse_double() {
-      double value;
-      gzread(file, &value, sizeof value);
-      return new Float(value);
-   }
-   
-   Value *parse_string() {
-      return new String(read_string());
-   }
-   
-   Value *parse_const() {
-      std::string name = read_string();
-      Value *value = parse_value();
-      return new Const(name, value);
-   }
-   
-   Value *parse_bitmask() {
-      unsigned long long value = 0;
-      int c;
-      do {
-         c = gzgetc(file);
-         switch(c) {
-         case Trace::TYPE_SINT:
-            value |= -read_uint();
-            break;
-         case Trace::TYPE_UINT:
-            value |= read_uint();
-            break;
-         case Trace::TYPE_CONST:
-            read_string();
-            break;
-         case Trace::TYPE_VOID:
-            goto done;
-         default:
-            std::cerr << "Unexpected type " << c << "\n";
-            assert(0);
-            return NULL;
-         }
-      } while(true);
-done:
-      return new UInt(value);
-   }
-
-   Value *parse_array() {
-      size_t len = read_uint();
-      Array *array = new Array(len);
-      for (size_t i = 0; i < len; ++i) {
-         array->values[i] = parse_value();
-      }
-      return array;
-   }
-   
-   Value *parse_pointer() {
-      unsigned long long addr;
-      Value *value;
-      addr = read_uint();
-      value = parse_value();
-      if (!value)
-         value = new UInt(addr);
-      return value;
-   }
-   
-   std::string read_string(void) {
-      size_t len = read_uint();
-      char * buf = new char[len];
-      gzread(file, buf, len);
-      std::string value(buf, len);
-      delete [] buf;
-      return value;
-   }
-
-   unsigned long long read_uint(void) {
-      unsigned long long value = 0;
-      int c;
-      unsigned shift = 0;
-      do {
-         c = gzgetc(file);
-         if (c == -1) {
-            break;
-         }
-         value |= (unsigned long long)(c & 0x7f) << shift;
-         shift += 7;
-      } while(c & 0x80);
-      return value;
-   }
+    unsigned long long version;
+
+    Parser();
+
+    ~Parser();
+
+    bool open(const char *filename);
+
+    void close(void);
+
+    Call *parse_call(void);
+
+protected:
+    void parse_enter(void);
+
+    Call *parse_leave(void);
+
+    bool parse_call_details(Call *call);
+
+    void parse_arg(Call *call);
+
+    Value *parse_value(void);
+
+    Value *parse_sint();
+
+    Value *parse_uint();
+
+    Value *parse_float();
+
+    Value *parse_double();
+
+    Value *parse_string();
+
+    Value *parse_enum();
+
+    Value *parse_bitmask();
+
+    Value *parse_array(void);
+
+    Value *parse_blob(void);
+
+    Value *parse_struct();
+
+    Value *parse_opaque();
+
+    const char * read_string(void);
+
+    unsigned long long read_uint(void);
+
+    inline int read_byte(void);
 };