Rename common to gdbsupport
[deliverable/binutils-gdb.git] / gdb / tui / tui-data.c
index c9f401f3912060bbb7362b6e24a41664fb93a3b9..a62dbf4d670c3679ee13f5d404ad9d2c476173a5 100644 (file)
@@ -36,36 +36,22 @@ struct tui_win_info *tui_win_list[MAX_MAJOR_WINDOWS];
 ****************************/
 static enum tui_layout_type current_layout = UNDEFINED_LAYOUT;
 static int term_height, term_width;
-static struct tui_gen_win_info _locator (LOCATOR_WIN);
-static struct tui_gen_win_info source_win (EXEC_INFO_WIN);
-static struct tui_gen_win_info disasm_win (EXEC_INFO_WIN);
+static struct tui_locator_window _locator;
 static std::vector<tui_source_window_base *> source_windows;
 static struct tui_win_info *win_with_focus = NULL;
 static struct tui_layout_def layout_def = {
   SRC_WIN,                     /* DISPLAY_MODE */
-  FALSE};                      /* SPLIT */
+};
 
 static int win_resized = FALSE;
 
 
-/*********************************
-** Static function forward decls
-**********************************/
-static void free_content (tui_win_content, 
-                         int, 
-                         enum tui_win_type);
-static void free_content_elements (tui_win_content, 
-                                  int, 
-                                  enum tui_win_type);
-
-
-
 /*********************************
 ** PUBLIC FUNCTIONS
 **********************************/
 
 int
-tui_win_is_auxillary (enum tui_win_type win_type)
+tui_win_is_auxiliary (enum tui_win_type win_type)
 {
   return (win_type > MAX_MAJOR_WINDOWS);
 }
@@ -177,33 +163,14 @@ tui_cmd_window::clear_detail ()
 void
 tui_data_window::clear_detail ()
 {
-  data_content = NULL;
-  data_content_count = 0;
-  regs_content = NULL;
-  regs_content_count = 0;
+  regs_content.clear ();
   regs_column_count = 1;
   display_regs = false;
 }
 
-/* Accessor for the source execution info ptr.  */
-struct tui_gen_win_info *
-tui_source_exec_info_win_ptr (void)
-{
-  return &source_win;
-}
-
-
-/* Accessor for the disassem execution info ptr.  */
-struct tui_gen_win_info *
-tui_disassem_exec_info_win_ptr (void)
-{
-  return &disasm_win;
-}
-
-
 /* Accessor for the locator win info.  Answers a pointer to the static
    locator win info struct.  */
-struct tui_gen_win_info *
+struct tui_locator_window *
 tui_locator_win_info_ptr (void)
 {
   return &_locator;
@@ -337,7 +304,7 @@ tui_partial_win_by_name (const char *name)
        {
           if (tui_win_list[i] != 0)
             {
-              const char *cur_name = tui_win_name (tui_win_list[i]);
+              const char *cur_name = tui_win_list[i]->name ();
 
               if (strlen (name) <= strlen (cur_name)
                  && startswith (cur_name, name))
@@ -351,110 +318,23 @@ tui_partial_win_by_name (const char *name)
 }
 
 
-/* Answer the name of the window.  */
-const char *
-tui_win_name (const struct tui_gen_win_info *win_info)
-{
-  const char *name = NULL;
-
-  switch (win_info->type)
-    {
-    case SRC_WIN:
-      name = SRC_NAME;
-      break;
-    case CMD_WIN:
-      name = CMD_NAME;
-      break;
-    case DISASSEM_WIN:
-      name = DISASSEM_NAME;
-      break;
-    case DATA_WIN:
-      name = DATA_NAME;
-      break;
-    default:
-      name = "";
-      break;
-    }
-
-  return name;
-}
-
-
-void
-tui_initialize_static_data (void)
-{
-  tui_init_generic_part (tui_source_exec_info_win_ptr ());
-  tui_init_generic_part (tui_disassem_exec_info_win_ptr ());
-  tui_init_generic_part (tui_locator_win_info_ptr ());
-}
-
-
 void
-tui_init_generic_part (struct tui_gen_win_info *win)
+tui_initialize_static_data ()
 {
+  tui_gen_win_info *win = tui_locator_win_info_ptr ();
   win->width =
     win->height =
     win->origin.x =
     win->origin.y =
     win->viewport_height =
-    win->content_size =
     win->last_visible_line = 0;
   win->handle = NULL;
-  win->content = NULL;
   win->content_in_use = FALSE;
   win->is_visible = false;
   win->title = 0;
 }
 
 
-/* init_content_element().
- */
-static void
-init_content_element (struct tui_win_element *element, 
-                     enum tui_win_type type)
-{
-  switch (type)
-    {
-    case SRC_WIN:
-    case DISASSEM_WIN:
-      element->which_element.source.line = NULL;
-      element->which_element.source.line_or_addr.loa = LOA_LINE;
-      element->which_element.source.line_or_addr.u.line_no = 0;
-      element->which_element.source.is_exec_point = FALSE;
-      element->which_element.source.has_break = FALSE;
-      break;
-    case DATA_WIN:
-      element->which_element.data_window = new struct tui_gen_win_info (DATA_ITEM_WIN);
-      element->which_element.data_window->content =
-       tui_alloc_content (1, DATA_ITEM_WIN);
-      element->which_element.data_window->content_size = 1;
-      break;
-    case CMD_WIN:
-      element->which_element.command.line = NULL;
-      break;
-    case DATA_ITEM_WIN:
-      element->which_element.data.name = NULL;
-      element->which_element.data.type = TUI_REGISTER;
-      element->which_element.data.item_no = UNDEFINED_ITEM;
-      element->which_element.data.value = NULL;
-      element->which_element.data.highlight = FALSE;
-      element->which_element.data.content = NULL;
-      break;
-    case LOCATOR_WIN:
-      element->which_element.locator.full_name[0] =
-       element->which_element.locator.proc_name[0] = (char) 0;
-      element->which_element.locator.line_no = 0;
-      element->which_element.locator.addr = 0;
-      break;
-    case EXEC_INFO_WIN:
-      memset(element->which_element.simple_string, ' ',
-             sizeof(element->which_element.simple_string));
-      break;
-    default:
-      break;
-    }
-}
-
 tui_win_info::tui_win_info (enum tui_win_type type)
   : tui_gen_win_info (type)
 {
@@ -468,258 +348,25 @@ tui_source_window_base::tui_source_window_base (enum tui_win_type type)
   start_line_or_addr.u.addr = 0;
 }
 
-struct tui_win_info *
-tui_alloc_win_info (enum tui_win_type type)
-{
-  switch (type)
-    {
-    case SRC_WIN:
-      return new tui_source_window ();
-
-    case DISASSEM_WIN:
-      return new tui_disasm_window ();
-
-    case DATA_WIN:
-      return new tui_data_window ();
-
-    case CMD_WIN:
-      return new tui_cmd_window ();
-    }
-
-  gdb_assert_not_reached (_("Unhandled window type"));
-}
-
-
-/* Allocates the content and elements in a block.  */
-tui_win_content
-tui_alloc_content (int num_elements, enum tui_win_type type)
+tui_gen_win_info::~tui_gen_win_info ()
 {
-  tui_win_content content;
-  struct tui_win_element *element_block_ptr;
-  int i;
-
-  content = XNEWVEC (struct tui_win_element *, num_elements);
-
-  /*
-   * All windows, except the data window, can allocate the
-   * elements in a chunk.  The data window cannot because items
-   * can be added/removed from the data display by the user at any
-   * time.
-   */
-  if (type != DATA_WIN)
-    {
-      element_block_ptr = XNEWVEC (struct tui_win_element, num_elements);
-      for (i = 0; i < num_elements; i++)
-       {
-         content[i] = element_block_ptr;
-         init_content_element (content[i], type);
-         element_block_ptr++;
-       }
-    }
-
-  return content;
-}
-
-
-/* Adds the input number of elements to the windows's content.  If no
-   content has been allocated yet, alloc_content() is called to do
-   this.  The index of the first element added is returned, unless
-   there is a memory allocation error, in which case, (-1) is
-   returned.  */
-int
-tui_add_content_elements (struct tui_gen_win_info *win_info, 
-                         int num_elements)
-{
-  struct tui_win_element *element_ptr;
-  int i, index_start;
-
-  if (win_info->content == NULL)
-    {
-      win_info->content = tui_alloc_content (num_elements, win_info->type);
-      index_start = 0;
-    }
-  else
-    index_start = win_info->content_size;
-  if (win_info->content != NULL)
-    {
-      for (i = index_start; (i < num_elements + index_start); i++)
-       {
-         element_ptr = XNEW (struct tui_win_element);
-         win_info->content[i] = element_ptr;
-         init_content_element (element_ptr, win_info->type);
-         win_info->content_size++;
-       }
-    }
-
-  return index_start;
+  tui_delete_win (handle);
+  xfree (title);
 }
 
 tui_source_window_base::~tui_source_window_base ()
 {
   xfree (fullname);
-  struct tui_gen_win_info *generic_win = execution_info;
-  if (generic_win != NULL)
-    {
-      tui_delete_win (generic_win->handle);
-      generic_win->handle = NULL;
-      tui_free_win_content (generic_win);
-    }
-}  
-
-tui_data_window::~tui_data_window ()
-{
-  if (content != NULL)
-    {
-      tui_free_data_content (regs_content, regs_content_count);
-      regs_content = NULL;
-      regs_content_count = 0;
-      tui_free_data_content (data_content, data_content_count);
-      data_content = NULL;
-      data_content_count = 0;
-      regs_column_count = 1;
-      display_regs = false;
-      content = NULL;
-      content_size = 0;
-    }
+  delete execution_info;
 }  
 
-tui_win_info::~tui_win_info ()
-{
-  if (handle != NULL)
-    {
-      tui_delete_win (handle);
-      handle = NULL;
-      tui_free_win_content (this);
-    }
-  if (title)
-    xfree (title);
-}
-
-
-void
-tui_free_all_source_wins_content ()
-{
-  for (tui_source_window_base *win_info : tui_source_windows ())
-    {
-      tui_free_win_content (win_info);
-      tui_free_win_content (win_info->execution_info);
-    }
-}
-
-
-void
-tui_free_win_content (struct tui_gen_win_info *win_info)
-{
-  if (win_info->content != NULL)
-    {
-      free_content (win_info->content,
-                  win_info->content_size,
-                  win_info->type);
-      win_info->content = NULL;
-    }
-  win_info->content_size = 0;
-}
-
-
-void
-tui_free_data_content (tui_win_content content, 
-                      int content_size)
-{
-  int i;
-
-  /* Remember that data window content elements are of type struct
-     tui_gen_win_info *, each of which whose single element is a data
-     element.  */
-  for (i = 0; i < content_size; i++)
-    {
-      struct tui_gen_win_info *generic_win
-       = content[i]->which_element.data_window;
-
-      if (generic_win != NULL)
-       {
-         tui_delete_win (generic_win->handle);
-         generic_win->handle = NULL;
-         tui_free_win_content (generic_win);
-       }
-    }
-  free_content (content,
-               content_size,
-               DATA_WIN);
-}
-
-
 /**********************************
 ** LOCAL STATIC FUNCTIONS        **
 **********************************/
 
 
-static void
-free_content (tui_win_content content, 
-             int content_size, 
-             enum tui_win_type win_type)
+tui_data_item_window::~tui_data_item_window ()
 {
-  if (content != NULL)
-    {
-      free_content_elements (content, content_size, win_type);
-      xfree (content);
-    }
-}
-
-
-/* free_content_elements().
- */
-static void
-free_content_elements (tui_win_content content, 
-                      int content_size, 
-                      enum tui_win_type type)
-{
-  if (content != NULL)
-    {
-      int i;
-
-      if (type == DISASSEM_WIN)
-       {
-         /* Free whole source block.  */
-         xfree (content[0]->which_element.source.line);
-       }
-      else
-       {
-         for (i = 0; i < content_size; i++)
-           {
-             struct tui_win_element *element;
-
-             element = content[i];
-             if (element != NULL)
-               {
-                 switch (type)
-                   {
-                   case SRC_WIN:
-                     xfree (element->which_element.source.line);
-                     break;
-                   case DATA_WIN:
-                     delete element->which_element.data_window;
-                     xfree (element);
-                     break;
-                   case DATA_ITEM_WIN:
-                     /* Note that data elements are not allocated in
-                        a single block, but individually, as
-                        needed.  */
-                     if (element->which_element.data.type != TUI_REGISTER)
-                       xfree ((void *)element->which_element.data.name);
-                     xfree (element->which_element.data.value);
-                      xfree (element->which_element.data.content);
-                     xfree (element);
-                     break;
-                   case CMD_WIN:
-                     xfree (element->which_element.command.line);
-                     break;
-                   default:
-                     break;
-                   }
-               }
-           }
-       }
-      if (type != DATA_WIN && type != DATA_ITEM_WIN)
-       xfree (content[0]);     /* Free the element block.  */
-    }
+  xfree (value);
+  xfree (content);
 }
This page took 0.028736 seconds and 4 git commands to generate.