Bugfixes and enhaced search feature with n/p navigation keys

Author: BatchDrake

INSTALL

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-

simtk/bitview.c

@@ -143,7 +143,7 @@ simtk_bitview_mark_region_noflip (const struct simtk_widget *widget,
 }
 
 int
-simtk_bitview_mark_region (const struct simtk_widget *widget,
+simtk_bitview_mark_region (struct simtk_widget *widget,
 			   const char *name,
 			   uint64_t start,
 			   uint64_t length,
@@ -279,7 +279,6 @@ simtk_bitview_render_bits_noflip (struct simtk_widget *widget)
 
       if (region != NULL)
       {
-	
 	bgcolor = region->bgcolor;
 
 	paint = offset + p >= region->start && offset + p < region->start + region->length;

simtk/bitview.h

@@ -72,13 +72,14 @@ struct simtk_bitview_properties *simtk_bitview_properties_new (int, int, const v
 void simtk_bitview_properties_lock (const struct simtk_bitview_properties *);
 void simtk_bitview_properties_unlock (const struct simtk_bitview_properties *);
 void simtk_bitview_properties_destroy (struct simtk_bitview_properties *);
+void simtk_bitview_clear_regions (const struct simtk_widget *);
 int simtk_bitview_mark_region_noflip (const struct simtk_widget *,
 			       const char *,
 			       uint64_t,
 			       uint64_t,
 			       uint32_t,
 			       uint32_t);
-int simtk_bitview_mark_region (const struct simtk_widget *,
+int simtk_bitview_mark_region (struct simtk_widget *,
 			       const char *,
 			       uint64_t,
 			       uint64_t,

src/Makefile.am

@@ -7,4 +7,4 @@ vix_LDFLAGS = @GLOBAL_LDFLAGS@
 
 vix_LDADD = ../sim-static/libsim.la ../simtk/libsimtk.la ../util/libutil.la scripting/libscripting.la @GLOBAL_LDFLAGS@ @GUILE_LIBS@
 
-vix_SOURCES = console.c console.h main.c map.c map.h hexview.c hexview.h vix.h
+vix_SOURCES = console.c console.h main.c map.c region.c region.h map.h hexview.c hexview.h vix.h

src/hexview.c

@@ -1,5 +1,6 @@
 #include <vix.h>
 #include <simtk/simtk.h>
+#include <region.h>
 #include "hexview.h"
 
 struct simtk_hexview_properties *
@@ -17,6 +18,14 @@ simtk_hexview_properties_new (uint32_t vaddr, const void *base, uint32_t size)
     return NULL;
   }
 
+  if ((new->regions = file_region_tree_new ()) == NULL)
+  {
+    SDL_DestroyMutex (new->lock);
+    free (new);
+
+    return NULL;
+  }
+  
   new->map  = base;
   new->map_size = size;
 
@@ -40,6 +49,8 @@ simtk_hexview_properties_destroy (struct simtk_hexview_properties *prop)
 {
   SDL_DestroyMutex (prop->lock);
 
+  rbtree_destroy (prop->regions);
+  
   free (prop);
 }
 
@@ -80,6 +91,61 @@ simtk_hexview_set_opaque (struct simtk_widget *widget, void *opaque)
   simtk_hexview_properties_unlock (prop);
 }
 
+void
+simtk_hexview_clear_regions (const struct simtk_widget *widget)
+{
+  struct simtk_hexview_properties *prop;
+
+  prop = simtk_hexview_get_properties (widget);
+
+  simtk_hexview_properties_lock (prop);
+
+  rbtree_clear (prop->regions);
+
+  simtk_hexview_properties_unlock (prop);
+}
+
+int
+simtk_hexview_mark_region_noflip (const struct simtk_widget *widget,
+			   const char *name,
+			   uint64_t start,
+			   uint64_t length,
+			   uint32_t fgcolor,
+			   uint32_t bgcolor)
+{
+  struct simtk_hexview_properties *prop;
+
+  int result;
+  
+  prop = simtk_hexview_get_properties (widget);
+
+  simtk_hexview_properties_lock (prop);
+
+  result = file_region_register (prop->regions, name, start, length, fgcolor, bgcolor);
+
+  simtk_hexview_properties_unlock (prop);
+
+  return result;
+}
+
+int
+simtk_hexview_mark_region (struct simtk_widget *widget,
+			   const char *name,
+			   uint64_t start,
+			   uint64_t length,
+			   uint32_t fgcolor,
+			   uint32_t bgcolor)
+
+{
+  int result;
+  
+  result = simtk_hexview_mark_region_noflip (widget, name, start, length, fgcolor, bgcolor);
+
+  simtk_widget_switch_buffers (widget);
+
+  return result;
+}
+
 #define HEX_MINIMAL 0x80
 #define ASCII_MINIMAL 0x80
 
@@ -88,6 +154,11 @@ simtk_hexview_render_noflip (struct simtk_widget *widget)
 {
   struct simtk_hexview_properties *hprop;
   struct simtk_textview_properties *prop;
+  struct file_region *region;
+  
+  uint32_t hex_bgcolor, hex_fgcolor;
+  uint32_t asc_bgcolor, asc_fgcolor;
+  uint32_t offset;
 
   unsigned int i;
   const void *addr;
@@ -97,6 +168,7 @@ simtk_hexview_render_noflip (struct simtk_widget *widget)
   uint8_t byte;
   uint32_t vaddr;
   unsigned int maxcols = 16;
+  struct rbtree_node *node;
 
   hprop = simtk_hexview_get_properties (widget);
   prop  = simtk_textview_get_properties (widget);
@@ -105,6 +177,13 @@ simtk_hexview_render_noflip (struct simtk_widget *widget)
 
   vaddr = hprop->vaddr + hprop->start;
   addr  = hprop->map   + hprop->start;
+
+  if ((node = file_region_find (hprop->regions, hprop->start)) != NULL)
+    region = (struct file_region *) rbtree_node_data (node);
+  else
+    region = NULL;
+
+  offset = hprop->start;
 
   for (i = hprop->start; i < hprop->map_size; ++i)
   {
@@ -121,13 +200,41 @@ simtk_hexview_render_noflip (struct simtk_widget *widget)
       simtk_textview_set_text (widget, 0, common_y, OPAQUE (0xff0000), 0x80000000, buffer, 10);
     }
 
+    if (region != NULL)
+      if (offset >= region->start + region->length)
+      {
+        if ((node = rbtree_node_next (node)) != NULL)
+          region = (struct file_region *) rbtree_node_data (node);
+        else
+          region = NULL;
+      }
+
     sprintf (buffer, "%02x ", byte = *((uint8_t *) addr));
+    
+    if (region != NULL && offset >= region->start && offset < region->start + region->length)
+    {
+      hex_fgcolor = region->fgcolor;
+      asc_fgcolor = region->fgcolor;
 
-    simtk_textview_set_text (widget, 3 * this_x + 10 , common_y, OPAQUE (RGB ((byte + HEX_MINIMAL) * 0xff / (0xff + HEX_MINIMAL), (byte + HEX_MINIMAL) * 0xa5 / (0xff + HEX_MINIMAL), 0)), 0x80000000, buffer, 3);
-    simtk_textview_set_text (widget, 10 + 3 * maxcols + this_x, common_y, OPAQUE (RGB (0, (byte + ASCII_MINIMAL) * 0xff / (0xff + HEX_MINIMAL), 0)), 0x80000000, addr++, 1);
+      hex_bgcolor = region->bgcolor;
+      asc_bgcolor = region->bgcolor;
+    }
+    else
+    {
+      hex_fgcolor = OPAQUE (RGB ((byte + HEX_MINIMAL) * 0xff / (0xff + HEX_MINIMAL), (byte + HEX_MINIMAL) * 0xa5 / (0xff + HEX_MINIMAL), 0));
+      hex_bgcolor = 0x80000000;
+        
+      asc_fgcolor = OPAQUE (RGB (0, (byte + ASCII_MINIMAL) * 0xff / (0xff + HEX_MINIMAL), 0));
+      asc_bgcolor = 0x80000000;
+    }
+
+    simtk_textview_set_text (widget, 3 * this_x + 10 , common_y, hex_fgcolor, hex_bgcolor, buffer, 3);
+    
+    simtk_textview_set_text (widget, 10 + 3 * maxcols + this_x, common_y, asc_fgcolor, asc_bgcolor, addr++, 1);
 
     ++this_x;
     ++vaddr;
+    ++offset;
   }
 
   simtk_hexview_properties_unlock (hprop);

src/hexview.h

@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
+#include <rbtree.h>
 
 struct simtk_hexview_properties
 {
@@ -18,7 +19,8 @@ struct simtk_hexview_properties
     const void *map;
     const uint8_t *bytes;
   };
-  
+
+  rbtree_t *regions;
   void *opaque;
 };
 
@@ -29,6 +31,20 @@ void simtk_heview_properties_destroy (struct simtk_hexview_properties *);
 
 struct simtk_hexview_properties *simtk_hexview_get_properties (const struct simtk_widget *);
 
+void simtk_hexview_clear_regions (const struct simtk_widget *);
+int simtk_hexview_mark_region_noflip (const struct simtk_widget *,
+			       const char *,
+			       uint64_t,
+			       uint64_t,
+			       uint32_t,
+			       uint32_t);
+int simtk_hexview_mark_region (struct simtk_widget *,
+			       const char *,
+			       uint64_t,
+			       uint64_t,
+			       uint32_t,
+			       uint32_t);
+
 void *simtk_hexview_get_opaque (const struct simtk_widget *);
 void  simtk_hexview_set_opaque (struct simtk_widget *, void *);
 void  simtk_hexview_render (struct simtk_widget *);