Mercurial > projects > ldc
annotate tests/mini/asm10.d @ 1442:0a5f7890f327
Adjust some more code that was depending on the function and delegate calling
conventions being equal.
There's also an instance in `tango.text.convert.Layout` that should be adjusted:
{{{
Index: tango/text/convert/Layout.d
===================================================================
--- tango/text/convert/Layout.d (revision 4578)
+++ tango/text/convert/Layout.d (working copy)
-660,8 +660,12 @@
case TypeCode.STRUCT:
auto s = cast(TypeInfo_Struct) type;
- if (s.xtoString)
- return Utf.fromString8 (s.xtoString(p), result);
+ if (s.xtoString) {
+ char[] delegate() toString;
+ toString.ptr = p;
+ toString.funcptr = cast(char[] function()) s.xtoString;
+ return Utf.fromString8 (toString(), result);
+ }
goto default;
case TypeCode.INTERFACE:
}}}
author | Frits van Bommel <fvbommel wxs.nl> |
---|---|
date | Sun, 31 May 2009 15:27:01 +0200 |
parents | 97d80437cb80 |
children |
rev | line source |
---|---|
1109
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
1 module asm10; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
2 |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
3 struct S { |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
4 ushort first; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
5 ushort second; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
6 int unaccessed; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
7 } |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
8 |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
9 void main() { |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
10 auto s = S(512, 42, -1); |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
11 ushort x = 0; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
12 version(D_InlineAsm_X86) { |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
13 asm { |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
14 lea EAX, s; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
15 mov CX, S.second[EAX]; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
16 mov x, CX; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
17 mov S.first[EAX], 640; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
18 } |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
19 } else version(D_InlineAsm_X86_64) { |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
20 asm { |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
21 lea RAX, s; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
22 mov CX, S.second[RAX]; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
23 mov x, CX; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
24 mov S.first[RAX], 640; |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
25 } |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
26 } |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
27 assert(x == 42); |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
28 assert(s.first == 640); |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
29 assert(s.second == 42); |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
30 assert(s.unaccessed == -1); |
97d80437cb80
Fix field access from inline asm. See tests/mini/asm10.d
Frits van Bommel <fvbommel wxs.nl>
parents:
diff
changeset
|
31 } |