Finished flattening D1/D2 differences. Except for one or two lines, all differences...

[software/druntime.git] / src / compiler / dmd / util / cpuid.d

diff --git a/src/compiler/dmd/util/cpuid.d b/src/compiler/dmd/util/cpuid.d
index b4d9cbab15647eb57b19cb366034b2b44652b13b..cbc5a3e05f1e07a9a8cabb164382d1a12d538e4f 100644 (file)
--- a/src/compiler/dmd/util/cpuid.d
+++ b/src/compiler/dmd/util/cpuid.d
@@ -47,7 +47,7 @@ version(D_InlineAsm_X86)
     /// Returns vendor string
     char[] vendor()             {return vendorStr;}
     /// Returns processor string
     /// Returns vendor string
     char[] vendor()             {return vendorStr;}
     /// Returns processor string

-    char[] processor()          {return processorStr;}
+    string processor()          {return processorStr;}

 
     /// Is MMX supported?
     bool mmx()                  {return (flags&MMX_BIT)!=0;}
 
     /// Is MMX supported?
     bool mmx()                  {return (flags&MMX_BIT)!=0;}


@@ -186,8 +186,8 @@ private:
     uint flags, misc, exflags, apic, signature;
     uint _stepping, _model, _family;
 
     uint flags, misc, exflags, apic, signature;
     uint _stepping, _model, _family;
 

-    char[12] vendorStr = "";
-    char[] processorStr = "";
+    char[12] vendorStr = 0;
+    string processorStr = "";

 
     uint maxThreads=1;
     uint maxCores=1;
 
     uint maxThreads=1;
     uint maxCores=1;


@@ -250,7 +250,7 @@ private:
             return;
 
         // seems many intel processors prepend whitespace
             return;
 
         // seems many intel processors prepend whitespace

-        processorStr = strip(toString(dst)).dup;
+        processorStr = cast(string)strip(toString(dst)).dup;

     }
 
     private void getFeatureFlags()
     }
 
     private void getFeatureFlags()


@@ -421,9 +421,14 @@ private:
             return stripr(stripl(s));
         }
 
             return stripr(stripl(s));
         }
 

-        string toString(char *s)
+        char[] toString(char* s)

         {
         {

-            return s ? s[0 .. strlen(s)] : cast(char[])null;
+            return s ? s[0 .. strlen(s)] : null;
+        }
+
+        string toString(invariant(char)* s)
+        {
+            return s ? s[0 .. strlen(s)] : null;

         }
     }
 }
         }
     }
 }