Refs #10260 OpenBSD support #25327

runtime/vm/cpuinfo_openbsd.cc

Index: runtime/vm/cpuinfo_openbsd.cc
diff --git a/runtime/vm/cpuinfo_win.cc b/runtime/vm/cpuinfo_openbsd.cc
similarity index 64%
copy from runtime/vm/cpuinfo_win.cc
copy to runtime/vm/cpuinfo_openbsd.cc
index b648566c5d8799fb04c1e134598bdcb408d443ce..f48e2b9f812c1a2ad6e1a25c2c3a520093965567 100644
--- a/runtime/vm/cpuinfo_win.cc
+++ b/runtime/vm/cpuinfo_openbsd.cc
@@ -1,17 +1,13 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
-#if defined(TARGET_OS_WINDOWS)
+#if defined(TARGET_OS_OPENBSD)
 
 #include "vm/cpuinfo.h"
 #include "vm/cpuid.h"
 
-// __cpuid()
-#include <intrin.h>  // NOLINT
-#include <string.h>  // NOLINT
-
 #include "platform/assert.h"
 
 namespace dart {
@@ -20,32 +16,29 @@ CpuInfoMethod CpuInfo::method_ = kCpuInfoDefault;
 const char* CpuInfo::fields_[kCpuInfoMax] = {0};
 
 void CpuInfo::InitOnce() {
+  fields_[kCpuInfoProcessor] = "vendor_id";
+  fields_[kCpuInfoModel] = "model name";
+  fields_[kCpuInfoHardware] = "model name";
+  fields_[kCpuInfoFeatures] = "flags";
   method_ = kCpuInfoCpuId;
-
-  // Initialize the CpuId information.
   CpuId::InitOnce();
-
-  fields_[kCpuInfoProcessor] = "Processor";
-  fields_[kCpuInfoModel] = "Hardware";
-  fields_[kCpuInfoHardware] = "Hardware";
-  fields_[kCpuInfoFeatures] = "Features";
+  return;

[ricow1, 2016/01/05 07:12:13]

why the return

[mulander, 2016/01/05 16:13:48]

Done.

[mulander, 2016/01/05 16:13:49]

Acknowledged. Not needed.

 }
 
 
 void CpuInfo::Cleanup() {
   CpuId::Cleanup();
+  return;

[ricow1, 2016/01/05 07:12:13]

why the return?

[mulander, 2016/01/05 16:13:48]

Acknowledged.Not needed.

[mulander, 2016/01/05 16:13:49]

Done.

 }
 
 
 bool CpuInfo::FieldContains(CpuInfoIndices idx, const char* search_string) {
-  ASSERT(method_ != kCpuInfoDefault);
   return strstr(CpuId::field(idx), search_string);
 }
 
 
 bool CpuInfo::FieldContainsByString(const char* field,
                                     const char* search_string) {
-  ASSERT(method_ != kCpuInfoDefault);
   for (int i = 0; i < kCpuInfoMax; i++) {
     if (strcmp(field, fields_[i]) == 0) {
       return FieldContains(static_cast<CpuInfoIndices>(i), search_string);
@@ -57,13 +50,11 @@ bool CpuInfo::FieldContainsByString(const char* field,
 
 
 const char* CpuInfo::ExtractField(CpuInfoIndices idx) {
-  ASSERT(method_ != kCpuInfoDefault);
   return CpuId::field(idx);
 }
 
 
 const char* CpuInfo::ExtractFieldByString(const char* field) {
-  ASSERT(method_ != kCpuInfoDefault);
   for (int i = 0; i < kCpuInfoMax; i++) {
     if (strcmp(field, fields_[i]) == 0) {
       return ExtractField(static_cast<CpuInfoIndices>(i));
@@ -75,13 +66,12 @@ const char* CpuInfo::ExtractFieldByString(const char* field) {
 
 
 bool CpuInfo::HasField(const char* field) {
-  ASSERT(method_ != kCpuInfoDefault);
   return (strcmp(field, fields_[kCpuInfoProcessor]) == 0) ||
-         (strcmp(field, fields_[kCpuInfoModel]) == 0) ||
-         (strcmp(field, fields_[kCpuInfoHardware]) == 0) ||
-         (strcmp(field, fields_[kCpuInfoFeatures]) == 0);
+    (strcmp(field, fields_[kCpuInfoModel]) == 0) ||
+    (strcmp(field, fields_[kCpuInfoHardware]) == 0) ||
+    (strcmp(field, fields_[kCpuInfoFeatures]) == 0);
 }
 
 }  // namespace dart
 
-#endif  // defined(TARGET_OS_WINDOWS)
+#endif  // defined(TARGET_OS_OPENBSD)