X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fmemattr.h;h=a7a4e510b385a2db8dfc437ab72fc55e40ce7940;hb=bb01dbfc041dccab2f2a2818068158f61b4c0fe2;hp=739df9480f16ac6141d3e946d4b0f88a5e1f26a9;hpb=4c38e0a4fcb69f8586d8db0b9cdb8dbab5980811;p=external%2Fbinutils.git

diff --git a/gdb/memattr.h b/gdb/memattr.h
index 739df94..a7a4e51 100644
--- a/gdb/memattr.h
+++ b/gdb/memattr.h
@@ -1,7 +1,6 @@
 /* Memory attributes support, for GDB.
 
-   Copyright (C) 2001, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,11 +20,9 @@
 #ifndef MEMATTR_H
 #define MEMATTR_H
 
-#include "vec.h"
-
 enum mem_access_mode
 {
-  MEM_NONE,                     /* Memory that is not physically present. */
+  MEM_NONE,                     /* Memory that is not physically present.  */
   MEM_RW,			/* read/write */
   MEM_RO,			/* read only */
   MEM_WO,			/* write only */
@@ -51,59 +48,85 @@ enum mem_access_width
    the mem_region structure.
 
    FIXME: It would be useful if there was a mechanism for targets to
-   add their own attributes.  For example, the number of wait states. */
+   add their own attributes.  For example, the number of wait states.  */
  
 struct mem_attrib 
 {
+  static mem_attrib unknown ()
+  {
+    mem_attrib attrib;
+
+    attrib.mode = MEM_NONE;
+
+    return attrib;
+  }
+
   /* read/write, read-only, or write-only */
-  enum mem_access_mode mode;
+  enum mem_access_mode mode = MEM_RW;
 
-  enum mem_access_width width;
+  enum mem_access_width width = MEM_WIDTH_UNSPECIFIED;
 
   /* enables hardware breakpoints */
-  int hwbreak;
+  int hwbreak = 0;
   
   /* enables host-side caching of memory region data */
-  int cache;
+  int cache = 0;
   
-  /* enables memory verification.  after a write, memory is re-read
-     to verify that the write was successful. */
-  int verify; 
+  /* Enables memory verification.  After a write, memory is re-read
+     to verify that the write was successful.  */
+  int verify = 0;
 
   /* Block size.  Only valid if mode == MEM_FLASH.  */
-  int blocksize;
+  int blocksize = -1;
 };
 
 struct mem_region 
 {
+  /* Create a mem_region with default attributes.  */
+
+  mem_region (CORE_ADDR lo_, CORE_ADDR hi_)
+    : lo (lo_), hi (hi_)
+  {}
+
+  /* Create a mem_region with access mode MODE_, but otherwise default
+     attributes.  */
+
+  mem_region (CORE_ADDR lo_, CORE_ADDR hi_, mem_access_mode mode_)
+    : lo (lo_), hi (hi_)
+  {
+    attrib.mode = mode_;
+  }
+
+  /* Create a mem_region with attributes ATTRIB_.  */
+
+  mem_region (CORE_ADDR lo_, CORE_ADDR hi_, const mem_attrib &attrib_)
+    : lo (lo_), hi (hi_), attrib (attrib_)
+  {}
+
+  bool operator< (const mem_region &other) const
+  {
+    return this->lo < other.lo;
+  }
+
   /* Lowest address in the region.  */
   CORE_ADDR lo;
   /* Address past the highest address of the region. 
      If 0, upper bound is "infinity".  */
   CORE_ADDR hi;
 
-  /* Item number of this memory region. */
-  int number;
+  /* Item number of this memory region.  */
+  int number = 0;
 
-  /* Status of this memory region (enabled if non-zero, otherwise disabled) */
-  int enabled_p;
+  /* Status of this memory region (enabled if true, otherwise
+     disabled).  */
+  bool enabled_p = true;
 
-  /* Attributes for this region */
-  struct mem_attrib attrib;
+  /* Attributes for this region.  */
+  mem_attrib attrib;
 };
 
-/* Declare a vector type for a group of mem_region structures.  The
-   typedef is necessary because vec.h can not handle a struct tag.
-   Except during construction, these vectors are kept sorted.  */
-typedef struct mem_region mem_region_s;
-DEF_VEC_O(mem_region_s);
-
-extern struct mem_region *lookup_mem_region(CORE_ADDR);
+extern struct mem_region *lookup_mem_region (CORE_ADDR);
 
 void invalidate_target_mem_regions (void);
 
-void mem_region_init (struct mem_region *);
-
-int mem_region_cmp (const void *, const void *);
-
 #endif	/* MEMATTR_H */