initial #5

Author: Levente Orban

jerry-core/debugger/debugger.h

@@ -22,7 +22,7 @@ extern int remote_init(void);
 extern void connection_closed(void);
 extern void send_to_client(const char* data, uint16_t data_len);
 
-int connection;
+int sockfd_connection; 
 
 typedef enum 
 {

jerry-core/parser/js/js-parser-internal.h

@@ -26,7 +26,7 @@
 
 #ifdef PARSER_DEBUG
   #include "debugger.h"
-  package bp_info[128]; 
+  package bp_info[128];
   jmem_cpointer_t debug_bytecode_data_cp;      /* < Compressed main program byte code pointer*/
   jmem_cpointer_t debug_func_bytecode_data_cp; /* < Compressed function byte code pointer*/
 #endif /* !PARSER_DEBUG */

jerry-core/parser/js/js-parser-statm.c

@@ -376,10 +376,10 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */
 
     function_name_t.type = FUNCTION_NAME; // Type 2 is the parsed function name
     function_name_t.msg_len = name_p->prop.length;
-    
+
     memcpy(function_name_t.msg, name_p->u.char_p, function_name_t.msg_len);
     function_name_t.msg[function_name_t.msg_len]='\0';
-    send(connection, &function_name_t, sizeof(function_name_t), 0);
+    send(sockfd_connection, &function_name_t, sizeof(function_name_t), 0);
   }
   #endif /* !PARSER_DEBUG */
 
@@ -1673,11 +1673,11 @@ parser_parse_statements (parser_context_t *context_p) /**< context */
      context_p->statement_line = context_p->line;
      context_p->line_info.pairs[context_p->line_info.count].line = context_p->statement_line;
 
-     printf("<<< line_info.pairs[%d].line=%d\n", context_p->line_info.count, context_p->statement_line);
+     //printf("<<< line_info.pairs[%d].line=%d\n", context_p->line_info.count, context_p->statement_line);
      context_p->line_info.count++;
 
      bp_info[context_p->line_info.count].line_index = context_p->statement_line;
-
+     printf("bp_info[%d].line_index = %d\n", context_p->line_info.count, bp_info[context_p->line_info.count].line_index );
      // Push breakpoint to the CBC code
      parser_emit_cbc (context_p, CBC_BREAKPOINT);
      parser_flush_cbc (context_p);

jerry-core/parser/js/js-parser.c

@@ -22,8 +22,8 @@
 
 #ifdef PARSER_DEBUG
  uint8_t bp_count = 0;
- // debug_breakpoints bp_info;
 #endif /* !PARSER_DEBUG */
+
 /** \addtogroup parser Parser
  * @{
  *
@@ -1267,9 +1267,9 @@ parser_post_processing (parser_context_t *context_p) /**< context */
   jmem_cpointer_t *literal_pool_p;
   uint8_t *dst_p;
 
-#ifdef PARSER_DEBUG
-  debug_literal_map_t literal_map_p;
-#endif /* PARSER_DEBUG */
+// #ifdef PARSER_DEBUG
+//   debug_literal_map_t literal_map_p;
+// #endif /* PARSER_DEBUG */
 
   printf("\n @@@@@@@@ parser post processing start @@@@@@@@@ \n");
 
@@ -1305,18 +1305,18 @@ parser_post_processing (parser_context_t *context_p) /**< context */
   page_p = context_p->byte_code.first_p;
   offset = 0;
 
-#ifdef PARSER_DEBUG
-  parser_list_iterator_t literal_iterator;
-  lexer_literal_t *literal_p;
-
-  parser_list_iterator_init (&context_p->literal_pool, &literal_iterator);
-  while ((literal_p = (lexer_literal_t *) parser_list_iterator_next (&literal_iterator)))
-  {
-    if (literal_p->type == LEXER_IDENT_LITERAL)
-    {
-      size_t size = literal_p->prop.length;
-      literal_map_p.literal_len = (uint8_t) size;  // debug_literal_map_t literal_map_p;
-      literal_map_p.index = literal_p->prop.index;
+// #ifdef PARSER_DEBUG
+//   parser_list_iterator_t literal_iterator;
+//   lexer_literal_t *literal_p;
+
+//   parser_list_iterator_init (&context_p->literal_pool, &literal_iterator);
+//   while ((literal_p = (lexer_literal_t *) parser_list_iterator_next (&literal_iterator)))
+//   {
+//     if (literal_p->type == LEXER_IDENT_LITERAL)
+//     {
+//       size_t size = literal_p->prop.length;
+//       literal_map_p.literal_len = (uint8_t) size;  // debug_literal_map_t literal_map_p;
+//       literal_map_p.index = literal_p->prop.index;
       // PRINT THE LITERAL IN THE CBC_CODES TO CHECK IT << NOT FINAL
       // const uint8_t *char_p = literal_p->u.char_p;
       // printf("\n");
@@ -1327,11 +1327,11 @@ parser_post_processing (parser_context_t *context_p) /**< context */
       // size--;
       // }
       // printf("\n");
-    }
-    literal_map_p.header.type = JERRY_DEBUG_MAP_INFO;
-    literal_map_p.header.size = (uint16_t) (sizeof (debug_literal_map_t) - 255 + literal_map_p.literal_len);
-  }
-#endif /* !PARSER_DEBUG */
+//     }
+//     literal_map_p.header.type = JERRY_DEBUG_MAP_INFO;
+//     literal_map_p.header.size = (uint16_t) (sizeof (debug_literal_map_t) - 255 + literal_map_p.literal_len);
+//   }
+// #endif /* !PARSER_DEBUG */
 
   while (page_p != last_page_p || offset < last_position)
   {
@@ -1596,10 +1596,11 @@ parser_post_processing (parser_context_t *context_p) /**< context */
       printf("<<< compressed bytecode: %d ", debug_func_bytecode_data_cp);
       uint32_t rel_offset = (uint32_t)debug_func_bytecode_data_cp - (uint32_t)rel_offset_tmp;
       //context_p->line_info.pairs[bp_count].offset = rel_offset;
-      printf("<<< line_info.pairs[%d].offset: %p\n", bp_count, rel_offset);
-      
       bp_info[bp_count].line_offset = rel_offset;
+
+      printf("bp_info[%d].line_offset = %p\n ", bp_count, bp_info[bp_count].line_offset);
       bp_count++;
+
     }
 #endif /* !PARSER_DEBUG */
 
@@ -1740,13 +1741,15 @@ parser_post_processing (parser_context_t *context_p) /**< context */
   context_p->header_info.start_address_p = compiled_code_p;
   context_p->header_info.name_len = 0;
 
-  printf("\n@@@@@@SEND THE BREAKPOINTS INFOS AFTER PARSING@@@@@@\n");
-  bp_info[bp_count].type = BREAKPOINT_INFO;
-  int tmp;
-  for ( tmp = 0; tmp < bp_count; tmp ++) {
-    send(connection, &bp_info[bp_count], sizeof(bp_info[bp_count]), 0);
-  }
-  bp_count = 0;
+  // printf("\n@@@@@@SEND THE BREAKPOINTS INFOS AFTER PARSING@@@@@@\n");
+  // bp_info[bp_count].type = BREAKPOINT_INFO;
+  // int tmp;
+
+  // for ( tmp = 0; tmp < bp_count; tmp ++) {
+  //   send(sockfd_connection, &bp_info[bp_count], sizeof(bp_info[bp_count]), 0);
+  // }
+  
+  // bp_count = 0;
 #endif /* PARSER_DEBUG */
 
 #ifdef PARSER_DUMP_BYTE_CODE

jerry-debugger/client.c

@@ -70,6 +70,6 @@ int main()
           }
 
         }
-        
+
   return 0;
 }

jerry-main/main-unix.c

@@ -71,7 +71,7 @@ read_file (const char *file_name,
   source_file_t.msg_len = strlen(file_name);
   memcpy(source_file_t.msg, file_name, source_file_t.msg_len + 1);
 
-  send(connection, &source_file_t, sizeof(source_file_t), 0); 
+  send(sockfd_connection, &source_file_t, sizeof(source_file_t), 0); 
   #endif /* !PARSER_DEBUG */
 
   fclose (file);
@@ -154,7 +154,7 @@ main (int argc,
   int files_counter = 0;
 
   #ifdef PARSER_DEBUG
-    connection = remote_init();
+    sockfd_connection = remote_init();
   #endif /* !PARSER_DEBUG */
 
   size_t max_data_bss_size, max_stack_size;