Reverting: Several changes to fix debug_stub:... (issue6489005)...

src/trusted/gdb_rsp/target.cc

 /*
  * Copyright 2010 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ skipping 24 matching lines @@
 Target::Target(const Abi* abi)
   : abi_(abi),
     mutex_(NULL),
     sig_start_(NULL),
     sig_done_(NULL),
     send_done_(false),
     ctx_(NULL),
     cur_signal_(-1),
     sig_thread_(0),
     run_thread_(-1),
-    reg_thread_(-1),
-    mem_base_(0) {
+    reg_thread_(-1) {
   if (NULL == abi_) abi_ = Abi::Get();
 }
 
 Target::~Target() {
   Destroy();
 }
 
 bool Target::Init() {
   string targ_xml = "l<target><architecture>";
 
@@ skipping 58 matching lines @@
 
 bool Target::RemoveTemporaryBreakpoints() {
   const Abi::BPDef *bp = abi_->GetBreakpointDef();
 
   // Iterate through the map, removing breakpoints
   while (!breakMap_.empty()) {
     // Copy the key/value locally
     BreakMap_t::iterator cur = breakMap_.begin();
     uint64_t addr = cur->first;
     uint8_t *data = cur->second;
-
+  
     // Then remove it from the map
     breakMap_.erase(cur);
 
     // Copy back the old code, and free the data
     IPlatform::SetMemory(addr, bp->size_, data);
     delete[] data;
   }
 
   return true;
 }
@@ skipping 295 matching lines @@
     // IN : $maaaa,llll
     // OUT: $xx..xx
     case 'm': {
         uint64_t addr;
         uint64_t wlen;
         uint32_t len;
         if (!pktIn->GetNumberSep(&addr, 0)) {
           err = BAD_FORMAT;
           break;
         }
-        if (addr < mem_base_) {
-          addr += mem_base_;
-        }
+
         if (!pktIn->GetNumberSep(&wlen, 0)) {
           err = BAD_FORMAT;
           break;
         }
 
         len = static_cast<uint32_t>(wlen);
         uint8_t *block = new uint8_t[len];
         if (!port::IPlatform::GetMemory(addr, len, block)) err = FAILED;
 
         pktOut->AddBlock(block, len);
         break;
       }
 
     // IN : $Maaaa,llll:xx..xx
     // OUT: $OK
     case 'M':  {
         uint64_t addr;
         uint64_t wlen;
         uint32_t len;
 
         if (!pktIn->GetNumberSep(&addr, 0)) {
           err = BAD_FORMAT;
           break;
         }
-        if (addr < mem_base_) {
-          addr += mem_base_;
-        }
-
         if (!pktIn->GetNumberSep(&wlen, 0)) {
           err = BAD_FORMAT;
           break;
         }
 
         len = static_cast<uint32_t>(wlen);
         uint8_t *block = new uint8_t[len];
         pktIn->GetBlock(block, len);
 
         if (!port::IPlatform::SetMemory(addr, len, block)) err = FAILED;
@@ skipping 152 matching lines @@
 
   return NULL;
 }
 
 
 }  // namespace gdb_rsp