update CIs (#30)

Author: 9il

.travis.yml

@@ -7,16 +7,16 @@ os:
 language: d
 
 d:
- # - dmd-2.071.2
- - ldc-1.1.0-beta2
+ - dmd
+ - ldc
 
 env:
  - ARCH="x86_64"
 
 matrix:
   include:
     # - {os: linux, d: dmd-2.071.2, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
-    - {os: linux, d: ldc-1.1.0-beta2, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
+    - {os: linux, d: ldc, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
     - {os: linux, d: gdc, env: ARCH="x86_64"}
 
 branches:

appveyor.yml

@@ -2,13 +2,13 @@ platform: x64
 environment:
  matrix:
   - DC: dmd
-    DVersion: 2.072.0
+    DVersion: 2.074.0
     arch: x64
   - DC: dmd
-    DVersion: 2.072.0
+    DVersion: 2.074.0
     arch: x86
   - DC: ldc
-    DVersion: '1.1.0-beta2'
+    DVersion: '1.3.0-beta1'
     arch: x64
 
 skip_tags: true

circle.yml

@@ -1,6 +1,6 @@
 machine:
   environment:
-    DMD: 2.072.0
+    DMD: 2.074.0
     DUB: 1.0.0
     PATH: "${HOME}/dmd2/linux/bin64:${PATH}"
     LD_LIBRARY_PATH: "${HOME}/dmd2/linux/lib64:${LD_LIBRARY_PATH}"

source/cpuid/x86_any.d

@@ -523,7 +523,7 @@ Params:
     eax = function id
     ecx = sub-function id
 +/
-pure nothrow @nogc
+pure nothrow @nogc @trusted
 CpuInfo _cpuid()(uint eax, uint ecx = 0)
 {
     uint a = void;
@@ -532,77 +532,39 @@ CpuInfo _cpuid()(uint eax, uint ecx = 0)
     uint d = void;
     version(LDC)
     {
-        // @@@FIXME@@@
-        // https://github.com/ldc-developers/ldc/issues/1823
-        version(Windows)
-        {
-            asm pure nothrow @nogc
-            {
-                mov EAX, eax;
-                mov ECX, ecx;
-                cpuid;
-                mov a, EAX;
-                mov b, EBX;
-                mov c, ECX;
-                mov d, EDX;
-            }
-        }
-        else
-        // @@@FIXME@@@
-        // https://github.com/ldc-developers/ldc/issues/1823
-        version(X86)
-        {
-            asm pure nothrow @nogc
-            {
-                mov EAX, eax;
-                mov ECX, ecx;
-                cpuid;
-                mov a, EAX;
-                mov b, EBX;
-                mov c, ECX;
-                mov d, EDX;
-            }
-        }
-        else
-        {
-            pragma(inline, true);
-            auto asmt = __asmtuple!
-            (uint, uint, uint, uint) (
-                "cpuid", 
-                "={eax},={ebx},={ecx},={edx},{eax},{ecx}", 
-                eax, ecx);
-            a = asmt.v[0];
-            b = asmt.v[1];
-            c = asmt.v[2];
-            d = asmt.v[3];
-        }
+        pragma(inline, true);
+        auto asmt = __asmtuple!
+        (uint, uint, uint, uint) (
+            "cpuid", 
+            "={eax},={ebx},={ecx},={edx},{eax},{ecx}", 
+            eax, ecx);
+        a = asmt.v[0];
+        b = asmt.v[1];
+        c = asmt.v[2];
+        d = asmt.v[3];
     }
     else
     version(GNU)
+    asm pure nothrow @nogc
     {
-        asm pure nothrow @nogc
-        {
-            "cpuid" : 
-                "=a" a,
-                "=b" b, 
-                "=c" c,
-                "=d" d,
-                : "a" eax, "c" ecx;
-        }
+        "cpuid" : 
+            "=a" a,
+            "=b" b, 
+            "=c" c,
+            "=d" d,
+            : "a" eax, "c" ecx;
     }
     else
     version(InlineAsm_X86_Any)
+    asm pure nothrow @nogc
     {
-        asm pure nothrow @nogc
-        {
-            mov EAX, eax;
-            mov ECX, ecx;
-            cpuid;
-            mov a, EAX;
-            mov b, EBX;
-            mov c, ECX;
-            mov d, EDX;
-        }
+        mov EAX, eax;
+        mov ECX, ecx;
+        cpuid;
+        mov a, EAX;
+        mov b, EBX;
+        mov c, ECX;
+        mov d, EDX;
     }
     else static assert(0);
     return CpuInfo(a, b, c, d);