Tests: introduced OPCODE debug.

diff --git a/src/njs_disassembler.c b/src/njs_disassembler.c
index 1fccd058f5547e3f2989dafc70c0c95916331869..d4c748484ab40d97d13ed0dc9bdab958fa974538 100644 (file)
--- a/src/njs_disassembler.c
+++ b/src/njs_disassembler.c
@@ -15,9 +15,6 @@ typedef struct {
 } njs_code_name_t;
 
 
-static void njs_disassemble(njs_vm_code_t *code);
-
-
 static njs_code_name_t  code_names[] = {
 
     { NJS_VMCODE_OBJECT, sizeof(njs_vmcode_object_t),
@@ -173,7 +170,7 @@ njs_disassembler(njs_vm_t *vm)
 
     while (n != 0) {
         njs_printf("%V:%V\n", &code->file, &code->name);
-        njs_disassemble(code);
+        njs_disassemble(code->start, code->end, -1, code->lines);
         code++;
         n--;
     }
@@ -182,10 +179,10 @@ njs_disassembler(njs_vm_t *vm)
 }
 
 
-static void
-njs_disassemble(njs_vm_code_t *code)
+void
+njs_disassemble(u_char *start, u_char *end, njs_int_t count, njs_arr_t *lines)
 {
-    u_char                       *p, *start, *end;
+    u_char                       *p;
     uint32_t                     line;
     njs_str_t                    *name;
     njs_uint_t                   n;
@@ -215,9 +212,6 @@ njs_disassemble(njs_vm_code_t *code)
     njs_vmcode_try_trampoline_t  *try_tramp;
     njs_vmcode_function_frame_t  *function;
 
-    start = code->start;
-    end = code->end;
-
     /*
      * On some 32-bit platform uintptr_t is int and compilers warn
      * about %l format modifier.  size_t has the size as pointer so
@@ -226,9 +220,9 @@ njs_disassemble(njs_vm_code_t *code)
 
     p = start;
 
-    while (p < end) {
+    while (((p < end) && (count == -1)) || (count-- > 0)) {
         operation = *(njs_vmcode_operation_t *) p;
-        line = njs_lookup_line(code, p - start);
+        line = njs_lookup_line(lines, p - start);
 
         if (operation == NJS_VMCODE_ARRAY) {
             array = (njs_vmcode_array_t *) p;

diff --git a/src/njs_error.c b/src/njs_error.c
index 518836bf64a933f07ec5c7ade59221c50455a667..96952ed74bae1d96d7ba9e2fcf24f47fca6a2ff2 100644 (file)
--- a/src/njs_error.c
+++ b/src/njs_error.c
@@ -1286,7 +1286,6 @@ njs_add_backtrace_entry(njs_vm_t *vm, njs_arr_t *stack,
     njs_native_frame_t *native_frame)
 {
     njs_int_t              ret;
-    njs_uint_t             i;
     njs_vm_code_t          *code;
     njs_function_t         *function;
     njs_backtrace_entry_t  *be;
@@ -1316,20 +1315,16 @@ njs_add_backtrace_entry(njs_vm_t *vm, njs_arr_t *stack,
         return NJS_OK;
     }
 
-    code = vm->codes->start;
-
-    for (i = 0; i < vm->codes->items; i++, code++) {
-        if (code->start <= native_frame->pc
-            && native_frame->pc < code->end)
-        {
-            be->name = code->name;
-            be->line = njs_lookup_line(code, native_frame->pc - code->start);
-            if (!vm->options.quiet) {
-                be->file = code->file;
-            }
+    code = njs_lookup_code(vm, native_frame->pc);
 
-            return NJS_OK;
+    if (code != NULL) {
+        be->name = code->name;
+        be->line = njs_lookup_line(code->lines, native_frame->pc - code->start);
+        if (!vm->options.quiet) {
+            be->file = code->file;
         }
+
+        return NJS_OK;
     }
 
     be->name = njs_entry_unknown;

diff --git a/src/njs_generator.c b/src/njs_generator.c
index 4d803e712df020016c3dcecbbea39767d6e22c03..6d775f630a6772fd899cad11f37f171c243e7746 100644 (file)
--- a/src/njs_generator.c
+++ b/src/njs_generator.c
@@ -808,8 +808,26 @@ njs_generate_code_map(njs_vm_t *vm, njs_generator_t *generator,
 }
 
 
+njs_vm_code_t *
+njs_lookup_code(njs_vm_t *vm, u_char *pc)
+{
+    njs_uint_t     i;
+    njs_vm_code_t  *code;
+
+    code = vm->codes->start;
+
+    for (i = 0; i < vm->codes->items; i++, code++) {
+        if (code->start <= pc && pc < code->end) {
+            return code;
+        }
+    }
+
+    return NULL;
+}
+
+
 uint32_t
-njs_lookup_line(njs_vm_code_t *code, uint32_t offset)
+njs_lookup_line(njs_arr_t *lines, uint32_t offset)
 {
     njs_uint_t         n;
     njs_vm_line_num_t  *map;
@@ -817,9 +835,9 @@ njs_lookup_line(njs_vm_code_t *code, uint32_t offset)
     n = 0;
     map = NULL;
 
-    if (code->lines != NULL) {
-        n = code->lines->items;
-        map = (njs_vm_line_num_t *) code->lines->start;
+    if (lines != NULL) {
+        n = lines->items;
+        map = (njs_vm_line_num_t *) lines->start;
     }
 
     while (n != 0) {

diff --git a/src/njs_generator.h b/src/njs_generator.h
index 045d598dd576160c78d0893bc2d2b49739bfb8db..581c438c83ed187e38fe5040e4f9b333dc176d56 100644 (file)
--- a/src/njs_generator.h
+++ b/src/njs_generator.h
@@ -45,7 +45,8 @@ njs_int_t njs_generator_init(njs_generator_t *generator, njs_str_t *file,
     njs_int_t depth, njs_bool_t runtime);
 njs_vm_code_t *njs_generate_scope(njs_vm_t *vm, njs_generator_t *generator,
     njs_parser_scope_t *scope, const njs_str_t *name);
-uint32_t njs_lookup_line(njs_vm_code_t *code, uint32_t offset);
+njs_vm_code_t *njs_lookup_code(njs_vm_t *vm, u_char *pc);
+uint32_t njs_lookup_line(njs_arr_t *lines, uint32_t offset);
 
 
 #endif /* _NJS_GENERATOR_H_INCLUDED_ */

diff --git a/src/njs_vm.h b/src/njs_vm.h
index f49a3022b93250c60fcf9243e5aec1f7551947da..f07bf0b31ee57a08f0df8b524dbbd26461a2cd35 100644 (file)
--- a/src/njs_vm.h
+++ b/src/njs_vm.h
@@ -258,6 +258,9 @@ njs_int_t njs_builtin_objects_clone(njs_vm_t *vm, njs_value_t *global);
 njs_int_t njs_builtin_match_native_function(njs_vm_t *vm,
     njs_function_t *function, njs_str_t *name);
 
+void njs_disassemble(u_char *start, u_char *end, njs_int_t count,
+    njs_arr_t *lines);
+
 njs_arr_t *njs_vm_completions(njs_vm_t *vm, njs_str_t *expression);
 
 void *njs_lvlhsh_alloc(void *data, size_t size);

diff --git a/src/njs_vmcode.c b/src/njs_vmcode.c
index ec478659cb14aae03441f35a494d7d653ba778a8..0b07ec67ea680532cb357e975ffe65bf200c3261 100644 (file)
--- a/src/njs_vmcode.c
+++ b/src/njs_vmcode.c
@@ -79,6 +79,11 @@ static njs_jump_off_t njs_function_frame_create(njs_vm_t *vm,
     } while (0)
 
 
+#ifdef NJS_OPCODE_DEBUG
+void njs_vmcode_debug(njs_vm_t *vm, u_char *pc, const char *prefix);
+#endif
+
+
 njs_int_t
 njs_vmcode_interpreter(njs_vm_t *vm, u_char *pc, void *promise_cap,
     void *async_ctx)
@@ -117,6 +122,10 @@ njs_vmcode_interpreter(njs_vm_t *vm, u_char *pc, void *promise_cap,
     njs_vmcode_try_trampoline_t  *try_trampoline;
     njs_vmcode_function_frame_t  *function_frame;
 
+#ifdef NJS_OPCODE_DEBUG
+    njs_vmcode_debug(vm, pc, "ENTER");
+#endif
+
 next:
 
     for ( ;; ) {
@@ -163,6 +172,10 @@ next:
          * as a single unsigned comparision.
          */
 
+#ifdef NJS_OPCODE_DEBUG
+        njs_disassemble(pc, NULL, 1, NULL);
+#endif
+
         if (op > NJS_VMCODE_NORET) {
 
             if (op == NJS_VMCODE_MOVE) {
@@ -650,6 +663,10 @@ next:
                 njs_vmcode_operand(vm, (njs_index_t) value2, value2);
                 vm->retval = *value2;
 
+#ifdef NJS_OPCODE_DEBUG
+                njs_vmcode_debug(vm, pc, "EXIT STOP");
+#endif
+
                 return NJS_OK;
 
             case NJS_VMCODE_JUMP:
@@ -723,6 +740,11 @@ next:
 
             case NJS_VMCODE_RETURN:
                 njs_vmcode_operand(vm, (njs_index_t) value2, value2);
+
+#ifdef NJS_OPCODE_DEBUG
+                njs_vmcode_debug(vm, pc, "EXIT RETURN");
+#endif
+
                 return njs_vmcode_return(vm, NULL, value2);
 
             case NJS_VMCODE_FUNCTION_COPY:
@@ -841,6 +863,11 @@ next:
 
             case NJS_VMCODE_AWAIT:
                 await = (njs_vmcode_await_t *) pc;
+
+#ifdef NJS_OPCODE_DEBUG
+                njs_vmcode_debug(vm, pc, "EXIT AWAIT");
+#endif
+
                 return njs_vmcode_await(vm, await, promise_cap, async_ctx);
 
             case NJS_VMCODE_TRY_START:
@@ -904,6 +931,11 @@ next:
 
                 switch (ret) {
                 case NJS_OK:
+
+#ifdef NJS_OPCODE_DEBUG
+                    njs_vmcode_debug(vm, pc, "EXIT FINALLY");
+#endif
+
                     return NJS_OK;
                 case NJS_ERROR:
                     goto error;
@@ -1018,6 +1050,10 @@ error:
         }
     }
 
+#ifdef NJS_OPCODE_DEBUG
+    njs_vmcode_debug(vm, pc, "EXIT ERROR");
+#endif
+
     return NJS_ERROR;
 }
 
@@ -2141,3 +2177,17 @@ njs_vmcode_error(njs_vm_t *vm, u_char *pc)
         njs_error_fmt_new(vm, &vm->retval, err->type, "%V", &err->u.message);
     }
 }
+
+
+#ifdef NJS_OPCODE_DEBUG
+void
+njs_vmcode_debug(njs_vm_t *vm, u_char *pc, const char *prefix)
+{
+    njs_vm_code_t  *code;
+
+    code = njs_lookup_code(vm, pc);
+
+    njs_printf("%s %V\n", prefix,
+               (code != NULL) ? &code->name : &njs_entry_unknown);
+}
+#endif