mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-04 00:54:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Win64 fixes

Browse source
This commit is contained in:
Walter Bright 2012-09-11 19:39:15 -07:00
parent 2346ef9a68
commit 18f7d60f0d
3 changed files with 49 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
std/format.d
View file

@ -30,7 +30,7 @@ version(unittest) {
import core.exception;
}
version (Windows) version (DigitalMars)
version (Win32) version (DigitalMars)
{
version = DigitalMarsC;
}
@ -4656,6 +4656,8 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
//doFormat(putc, (&valti)[0 .. 1], p);
version(X86)
argptr = p;
else version(Win64)
argptr = p;
else version(X86_64)
{
__va_list va;
@ -4706,6 +4708,8 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
//doFormat(putc, (&keyti)[0..1], pkey);
version (X86)
argptr = pkey;
else version (Win64)
argptr = pkey;
else version (X86_64)
{ __va_list va;
va.stack_args = pkey;
@ -4721,6 +4725,8 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
//doFormat(putc, (&valti)[0..1], pvalue);
version (X86)
argptr = pvalue;
else version (Win64)
argptr = pvalue;
else version (X86_64)
{ __va_list va2;
va2.stack_args = pvalue;
@ -4874,6 +4880,8 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
case Mangle.Tsarray:
version (X86)
putArray(argptr, (cast(TypeInfo_StaticArray)ti).len, cast()(cast(TypeInfo_StaticArray)ti).next);
else version (Win64)
putArray(argptr, (cast(TypeInfo_StaticArray)ti).len, cast()(cast(TypeInfo_StaticArray)ti).next);
else
putArray((cast(__va_list*)argptr).stack_args, (cast(TypeInfo_StaticArray)ti).len, cast()(cast(TypeInfo_StaticArray)ti).next);
return;
@ -4973,6 +4981,11 @@ void doFormat(void delegate(dchar) putc, TypeInfo[] arguments, va_list argptr)
s = tis.xtoString(argptr);
argptr += (tis.tsize() + 3) & ~3;
}
else version(Win64)
{
s = tis.xtoString(argptr);
argptr += (tis.tsize() + 3) & ~3;
}
else version (X86_64)
{
void[32] parmn = void; // place to copy struct if passed in regs