Add custom implementation of NXGetArchInfoXXX to allow adding new arch.

src/common/mac/arch_utilities.cc

+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "common/mac/arch_utilities.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#ifndef CPU_TYPE_ARM
+#define CPU_TYPE_ARM (static_cast<cpu_type_t>(12))
+#endif //  CPU_TYPE_ARM

[Mark Mentovai, 2012/10/03 13:06:51]

Nit: you’re supposed to put the extra space on the left side of the //, not the
right.

[qsr, 2012/10/03 15:56:29]

Done.

+
+namespace {
+const cpu_subtype_t kArmv7CpuSubType = 9;
+const cpu_subtype_t kArmv7sCpuSubType = 11;
+}  // namespace
+
+namespace MacArchUtils {
+
+const NXArchInfo* BreakpadGetArchInfoFromName(const char* arch_name) {
+  if (!strcmp("armv7s", arch_name))
+    return BreakpadGetArchInfoFromCpuType(CPU_TYPE_ARM,
+                                          kArmv7sCpuSubType);
+  return NXGetArchInfoFromName(arch_name);
+}
+
+const NXArchInfo* BreakpadGetArchInfoFromCpuType(cpu_type_t cpu_type,
+                                                 cpu_subtype_t cpu_subtype) {
+  if (cpu_type == CPU_TYPE_ARM && cpu_subtype == kArmv7sCpuSubType) {
+    static NXArchInfo armv7s_arch_info;

[Mark Mentovai, 2012/10/03 13:06:51]

Isn’t this better? Let the compiler worry about initializing the static.

static const NXArchInfo* ArchInfo_armv7s() {
  NXArchInfo* armv7s = new NXArchInfo;
  // …
  armv7s->name = "armv7s";
  // …
  return armv7s;
}

const NXArchInfo* BreakpadGetArchInfoFromCpuType(…) {
  if (cpu_type == CPU_TYPE_ARM && cpu_subtype == kArmv7sCpuSubType) {
    static const NXArchInfo* armv7s_arch_info = ArchInfo_armv7s();
    return armv7s_arch_info;
  }
  return NXGetArchInfoFromCpuType(cpu_type, cpu_subtype);
}

[qsr, 2012/10/03 15:56:29]

Done.

+    if (!armv7s_arch_info.name) {
+      // Infer correct value from the armv7 sub type.
+      armv7s_arch_info = *BreakpadGetArchInfoFromCpuType(CPU_TYPE_ARM,
+                                                         kArmv7CpuSubType);
+      armv7s_arch_info.name = "armv7s";
+      armv7s_arch_info.cpusubtype = kArmv7sCpuSubType;
+    }
+    return &armv7s_arch_info;
+  }
+  return NXGetArchInfoFromCpuType(cpu_type, cpu_subtype);
+}
+
+}  // namespace MacArchUtils