# HG changeset patch # User Frits van Bommel # Date 1234995514 -3600 # Node ID 855889b7b268460fe5fca87676ddfff874162ccb # Parent ae710cba0884b469fef3759f2f94130affc13669 Update some testcases now that 64-bit immediates are working. diff -r ae710cba0884 -r 855889b7b268 tests/mini/asm5.d --- a/tests/mini/asm5.d Wed Feb 18 22:50:22 2009 +0100 +++ b/tests/mini/asm5.d Wed Feb 18 23:18:34 2009 +0100 @@ -17,7 +17,7 @@ asm { mov EAX, 0xFF; mov EDX, 0xAA; } } else version(X86_64) { - asm { movq RAX, 0xFF; } + asm { movq RAX, 0xAA000000FF; } } else static assert(0, "todo"); } @@ -29,11 +29,5 @@ l = 4; l = 8; assert(foo() == 42); - version(X86) - { - assert(bar() == 0x000000AA000000FF); - } else version(X86_64) - { - assert(bar() == 0x00000000000000FF); - } + assert(bar() == 0xAA000000FF); } diff -r ae710cba0884 -r 855889b7b268 tests/mini/asm8.d --- a/tests/mini/asm8.d Wed Feb 18 22:50:22 2009 +0100 +++ b/tests/mini/asm8.d Wed Feb 18 23:18:34 2009 +0100 @@ -23,7 +23,7 @@ } else version (X86_64) { - asm { movq RAX, 0xFF; } + asm { movq RAX, 0xAA000000FF; } } else static assert(0, "todo"); } @@ -357,14 +357,7 @@ auto adg = &gobj.toString; assert(foo() == 42); - version(X86) - { - assert(bar() == 0x000000AA000000FF); - } - else version (X86_64) - { - assert(bar() == 0x00000000000000FF); - } + assert(bar() == 0xAA000000FF); assert(onef() == 1); assert(oned() == 1); assert(oner() == 1); diff -r ae710cba0884 -r 855889b7b268 tests/mini/naked_asm2.d --- a/tests/mini/naked_asm2.d Wed Feb 18 22:50:22 2009 +0100 +++ b/tests/mini/naked_asm2.d Wed Feb 18 23:18:34 2009 +0100 @@ -1,6 +1,6 @@ int foo() { - static int fourty2 = 42; + static size_t fourty2 = 42; version(X86) asm { diff -r ae710cba0884 -r 855889b7b268 tests/mini/naked_asm6.d --- a/tests/mini/naked_asm6.d Wed Feb 18 22:50:22 2009 +0100 +++ b/tests/mini/naked_asm6.d Wed Feb 18 23:18:34 2009 +0100 @@ -4,7 +4,7 @@ version (X86) asm { naked; mov EAX, 0xff; mov EDX, 0xaa; ret; } else version (X86_64) - asm { naked; mov EAX, 0xff; mov EDX, 0xaa; ret; } + asm { naked; mov RAX, 0xaa000000ff; ret; } } ulong retval2() { @@ -12,18 +12,9 @@ } void main() { - ulong a,b; - a = retval(); - b = retval2(); + auto a = retval(); + auto b = retval2(); printf("%llu\n%llu\n", retval(), retval2()); - version (X86) - { - assert(a == 0x000000aa000000ff); + assert(a == 0xaa000000ff); assert(a == b); - } - else version (X86_64) - { - assert(a == 0xff); - assert(b == 0x000000aa000000ff); - } }