Create snapshot/mac and move some files from snapshot and util to there

snapshot/mac/mach_o_image_symbol_table_reader.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/mac/mach_o_image_symbol_table_reader.h"
+#include "snapshot/mac/mach_o_image_symbol_table_reader.h"
 
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "util/mac/checked_mach_address_range.h"
 #include "util/mach/task_memory.h"
 
 namespace crashpad {
@@ skipping 10 matching lines @@
 class MachOImageSymbolTableReaderInitializer {
  public:
   MachOImageSymbolTableReaderInitializer(
       ProcessReader* process_reader,
       const MachOImageSegmentReader* linkedit_segment,
       const std::string& module_info)
       : module_info_(module_info),
         linkedit_range_(),
         process_reader_(process_reader),
         linkedit_segment_(linkedit_segment) {
-    linkedit_range_.SetRange(
-        process_reader_, linkedit_segment->Address(), linkedit_segment->Size());
+    linkedit_range_.SetRange(process_reader_->Is64Bit(),
+                             linkedit_segment->Address(),
+                             linkedit_segment->Size());
     DCHECK(linkedit_range_.IsValid());
   }
 
   ~MachOImageSymbolTableReaderInitializer() {}
 
   //! \brief Reads the symbol table from another process.
   //!
   //! \sa MachOImageSymbolTableReader::Initialize()
   bool Initialize(const process_types::symtab_command* symtab_command,
                   const process_types::dysymtab_command* dysymtab_command,
@@ skipping 133 matching lines @@
   //! \param[in] tag A string that identifies the range being checked. This is
   //!     used only for logging.
   //!
   //! \return `true` if the range identified by \a address + \a size lies
   //!     entirely within the `__LINKEDIT` segment. `false` if that range is
   //!     invalid, or if that range is not contained by the `__LINKEDIT`
   //!     segment, with an appropriate message logged.
   bool IsInLinkEditSegment(mach_vm_address_t address,
                            mach_vm_size_t size,
                            const char* tag) const {
-    CheckedMachAddressRange subrange(process_reader_, address, size);
+    CheckedMachAddressRange subrange(process_reader_->Is64Bit(), address, size);
     if (!subrange.IsValid()) {
       LOG(WARNING) << base::StringPrintf("invalid %s range (0x%llx + 0x%llx)",
                                          tag,
                                          address,
                                          size) << module_info_;
       return false;
     }
 
     if (!linkedit_range_.ContainsRange(subrange)) {
       LOG(WARNING) << base::StringPrintf(
@@ skipping 53 matching lines @@
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
 
   const auto& iterator = external_defined_symbols_.find(name);
   if (iterator == external_defined_symbols_.end()) {
     return nullptr;
   }
   return &iterator->second;
 }
 
 }  // namespace crashpad