[LLDB][MIPS] fix watchpoint searched on client side for same masked variables

[mohit.bhakkad]

Summary

rL249837 doesn't solves all the issues with MIPS false positives, some of the cases are not working.
so need to replace it with this logic.

lldb/trunk/include/lldb/Core/ArchSpec.h

enum Core
 
         kCore_mips32el_first  = eCore_mips32el,
         kCore_mips32el_last   = eCore_mips32r6el,
 
         kCore_mips64_first  = eCore_mips64,
         kCore_mips64_last   = eCore_mips64r6,
 
         kCore_mips64el_first  = eCore_mips64el,
-        kCore_mips64el_last   = eCore_mips64r6el
+        kCore_mips64el_last   = eCore_mips64r6el,
+
+        kCore_mips_first  = eCore_mips32,
+        kCore_mips_last   = eCore_mips64r6el
+
     };
 
     typedef void (* StopInfoOverrideCallbackType)(lldb_private::Thread &thread);
 
     //------------------------------------------------------------------
     /// Default constructor.
     ///
     /// Default constructor that initializes the object with invalid

lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

if (tid != LLDB_INVALID_THREAD_ID)
                         {
                             StringExtractor desc_extractor(description.c_str());
                             addr_t wp_addr = desc_extractor.GetU64(LLDB_INVALID_ADDRESS);
                             uint32_t wp_index = desc_extractor.GetU32(LLDB_INVALID_INDEX32);
                             addr_t wp_hit_addr = desc_extractor.GetU64(LLDB_INVALID_ADDRESS);
                             watch_id_t watch_id = LLDB_INVALID_WATCH_ID;
                             if (wp_addr != LLDB_INVALID_ADDRESS)
                             {
-                                if (wp_hit_addr != LLDB_INVALID_ADDRESS)
-                                    wp_addr = wp_hit_addr;
-                                WatchpointSP wp_sp = GetTarget().GetWatchpointList().FindByAddress(wp_addr);
+                                WatchpointSP wp_sp;
+                                ArchSpec::Core core = GetTarget().GetArchitecture().GetCore();
+                                if (core >= ArchSpec::kCore_mips_first && core <= ArchSpec::kCore_mips_last)
+                                    wp_sp = GetTarget().GetWatchpointList().FindByAddress(wp_hit_addr);
+                                if (!wp_sp)
+                                    wp_sp = GetTarget().GetWatchpointList().FindByAddress(wp_addr);
                                 if (wp_sp)
                                 {
                                     wp_sp->SetHardwareIndex(wp_index);
                                     watch_id = wp_sp->GetID();
                                 }
                             }
                             if (watch_id == LLDB_INVALID_WATCH_ID)
                             {