/[jscoverage]/trunk/instrument-js.cpp
ViewVC logotype

Diff of /trunk/instrument-js.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 357 by siliconforks, Fri Oct 24 21:48:21 2008 UTC revision 372 by siliconforks, Mon Oct 27 20:36:23 2008 UTC
# Line 52  Line 52 
52    struct IfDirective * next;    struct IfDirective * next;
53  };  };
54    
55    bool jscoverage_mozilla = false;
56    
57  static bool * exclusive_directives = NULL;  static bool * exclusive_directives = NULL;
58    
59  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
# Line 68  Line 70 
70  static uint16_t num_lines = 0;  static uint16_t num_lines = 0;
71    
72  void jscoverage_set_js_version(const char * version) {  void jscoverage_set_js_version(const char * version) {
73    js_version = atoi(version);    js_version = JS_StringToVersion(version);
74      if (js_version != JSVERSION_UNKNOWN) {
75        return;
76      }
77    
78      char * end;
79      js_version = (JSVersion) strtol(version, &end, 10);
80      if ((size_t) (end - version) != strlen(version)) {
81        fatal("invalid version: %s", version);
82      }
83  }  }
84    
85  void jscoverage_init(void) {  void jscoverage_init(void) {
# Line 324  Line 335 
335    assert(object == &function->object);    assert(object == &function->object);
336    Stream_printf(f, "%*s", indent, "");    Stream_printf(f, "%*s", indent, "");
337    if (type == FUNCTION_NORMAL) {    if (type == FUNCTION_NORMAL) {
338      Stream_write_string(f, "function");      Stream_write_string(f, "function ");
339    }    }
340    
341    /* function name */    /* function name */
342    if (function->atom) {    if (function->atom) {
     Stream_write_char(f, ' ');  
343      print_string_atom(function->atom, f);      print_string_atom(function->atom, f);
344    }    }
345    
# Line 337  Line 347 
347    function parameters - see JS_DecompileFunction in jsapi.cpp, which calls    function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
348    js_DecompileFunction in jsopcode.cpp    js_DecompileFunction in jsopcode.cpp
349    */    */
350    Stream_write_string(f, "(");    Stream_write_char(f, '(');
351    JSArenaPool pool;    JSArenaPool pool;
352    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
353    jsuword * local_names = NULL;    jsuword * local_names = NULL;
# Line 353  Line 363 
363      }      }
364      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
365      if (param == NULL) {      if (param == NULL) {
366        fatal("unsupported parameter type for function: %s", file_id);        fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported parameter type for function");
367      }      }
368      print_string_atom(param, f);      print_string_atom(param, f);
369    }    }
# Line 549  Line 559 
559        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
560        break;        break;
561      default:      default:
562        fatal("%s: unknown operator (%d) in file", file_id, node->pn_op);        fatal_source(file_id, node->pn_pos.begin.lineno, "unknown operator (%d)", node->pn_op);
563        break;        break;
564      }      }
565      break;      break;
# Line 659  Line 669 
669      Stream_write_char(f, '{');      Stream_write_char(f, '{');
670      for (struct JSParseNode * p = node->pn_head; p != NULL; p = p->pn_next) {      for (struct JSParseNode * p = node->pn_head; p != NULL; p = p->pn_next) {
671        if (p->pn_type != TOK_COLON) {        if (p->pn_type != TOK_COLON) {
672          fatal("unsupported node type in file %s: %d", file_id, p->pn_type);          fatal_source(file_id, p->pn_pos.begin.lineno, "unsupported node type (%d)", p->pn_type);
673        }        }
674        if (p != node->pn_head) {        if (p != node->pn_head) {
675          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
# Line 677  Line 687 
687          }          }
688          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
689          if (p->pn_right->pn_type != TOK_FUNCTION) {          if (p->pn_right->pn_type != TOK_FUNCTION) {
690            fatal("parse error: expected function");            fatal_source(file_id, p->pn_pos.begin.lineno, "expected function");
691          }          }
692          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);
693          break;          break;
# Line 803  Line 813 
813      instrument_declarations(node, f);      instrument_declarations(node, f);
814      break;      break;
815    default:    default:
816      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
817    }    }
818  }  }
819    
# Line 832  Line 842 
842      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
843      if (! is_jscoverage_if) {      if (! is_jscoverage_if) {
844        if (line > num_lines) {        if (line > num_lines) {
845          fatal("%s: script contains more than 65,535 lines", file_id);          fatal("file %s contains more than 65,535 lines", file_id);
846        }        }
847        if (line >= 2 && exclusive_directives[line - 2]) {        if (line >= 2 && exclusive_directives[line - 2]) {
848          is_jscoverage_if = true;          is_jscoverage_if = true;
# Line 1128  Line 1138 
1138      Stream_write_string(f, "debugger;\n");      Stream_write_string(f, "debugger;\n");
1139      break;      break;
1140    default:    default:
1141      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
1142    }    }
1143  }  }
1144    
# Line 1141  Line 1151 
1151    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1152      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1153      if (line > num_lines) {      if (line > num_lines) {
1154        fatal("%s: script contains more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1155      }      }
1156    
1157      /* the root node has line number 0 */      /* the root node has line number 0 */
# Line 1189  Line 1199 
1199  }  }
1200    
1201  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1202    fprintf(stderr, "jscoverage: parse error: line %u: %s\n", report->lineno, message);    warn_source(file_id, report->lineno, "%s", message);
1203  }  }
1204    
1205  void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {  void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {
# Line 1198  Line 1208 
1208    /* parse the javascript */    /* parse the javascript */
1209    JSParseContext parse_context;    JSParseContext parse_context;
1210    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1211      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file %s", file_id);
1212    }    }
1213    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1214    JSParseNode * node = js_ParseScript(context, global, &parse_context);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1215    if (node == NULL) {    if (node == NULL) {
1216      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1217      fatal("parse error in file: %s", file_id);      fatal("parse error in file %s", file_id);
1218    }    }
1219    JS_SetErrorReporter(context, old_error_reporter);    JS_SetErrorReporter(context, old_error_reporter);
1220    num_lines = node->pn_pos.end.lineno;    num_lines = node->pn_pos.end.lineno;
# Line 1225  Line 1235 
1235    size_t i = 0;    size_t i = 0;
1236    while (i < num_characters) {    while (i < num_characters) {
1237      if (line_number == UINT16_MAX) {      if (line_number == UINT16_MAX) {
1238        fatal("%s: script has more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1239      }      }
1240      line_number++;      line_number++;
1241      size_t line_start = i;      size_t line_start = i;
# Line 1292  Line 1302 
1302    
1303    /* write line number info to the output */    /* write line number info to the output */
1304    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
1305    Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");    if (jscoverage_mozilla) {
1306    Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");      Stream_write_string(output, "try {\n");
1307        Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
1308        Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
1309        Stream_write_string(output, "}\n");
1310        Stream_write_string(output, "catch (e) {\n");
1311        Stream_write_string(output, "  _$jscoverage = {};\n");
1312        Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
1313        Stream_write_string(output, "}\n");
1314      }
1315      else {
1316        Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
1317        Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
1318      }
1319    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
1320    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
1321    for (int i = 0; i < num_lines; i++) {    for (int i = 0; i < num_lines; i++) {

Legend:
Removed from v.357  
changed lines
  Added in v.372

  ViewVC Help
Powered by ViewVC 1.1.24