Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.

[2.067] MSVCRT 14 (VS 2015) support #29

Closed
kinke wants to merge 3 commits into from
Closed

[2.067] MSVCRT 14 (VS 2015) support #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41983f8
core.stdc.stdarg: mark LDC vararg intrinsics @nogc nothrow.
kinke Feb 27, 2015
6a1c9d3
core.stdc.stdio: add experimental support for MSVCRT 14 (VS 2015).
kinke Feb 27, 2015
6cc6cdb
MSVC: require Visual Studio 2015 by default
kinke Aug 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/core/stdc/stdarg.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,10 @@ version( LDC )
alias char* va_list;

pragma(LDC_va_start)
void va_start(T)(va_list ap, ref T);
void va_start(T)(va_list ap, ref T) @nogc nothrow;

private pragma(LDC_va_arg)
T va_arg_intrinsic(T)(va_list ap);
T va_arg_intrinsic(T)(va_list ap) @nogc nothrow;

T va_arg(T)(ref va_list ap)
{
Expand Down Expand Up @@ -486,10 +486,10 @@ version( LDC )
}

pragma(LDC_va_end)
void va_end(va_list ap);
void va_end(va_list ap) @nogc nothrow;

pragma(LDC_va_copy)
void va_copy(out va_list dest, va_list src);
void va_copy(out va_list dest, va_list src) @nogc nothrow;
}
else version( X86 )
{
Expand Down
143 changes: 109 additions & 34 deletions src/core/stdc/stdio.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ private
}
}

// comment the following line for MSVCRT < 14 (Visual Studio 2013 and older)
version(LDC) { version(Win64) version = LDC_MSVCRT14; }

extern (C):
@system:
nothrow:
Expand Down Expand Up @@ -77,19 +80,30 @@ else version( CRuntime_Microsoft )
///
FILENAME_MAX = 260,
///
TMP_MAX = 32767,
///
_SYS_OPEN = 20, // non-standard
}

///
enum int _NFILE = 512; // non-standard

version( LDC_MSVCRT14 ) // requires MSVCRT >= 14 (VS 2015)
{
///
enum int TMP_MAX = int.max;
///
enum int L_tmpnam = 260;
}
else
{
///
enum int TMP_MAX = short.max;
///
enum string _P_tmpdir = "\\"; // non-standard
///
enum wstring _wP_tmpdir = "\\"; // non-standard
///
enum int L_tmpnam = _P_tmpdir.length + 12;
}
}
else version( linux )
{
Expand Down Expand Up @@ -259,8 +273,18 @@ version( CRuntime_DigitalMars )
else version( CRuntime_Microsoft )
{
///
alias int fpos_t; //check this
alias long fpos_t;

version( LDC_MSVCRT14 ) // requires MSVCRT >= 14 (VS 2015)
{
///
struct _iobuf
{
void* _Placeholder;
}
}
else
{
///
struct _iobuf
{
Expand All @@ -273,6 +297,7 @@ else version( CRuntime_Microsoft )
int _bufsiz;
char* _tmpfname;
}
}

///
alias shared(_iobuf) FILE;
Expand Down Expand Up @@ -549,38 +574,53 @@ else version( CRuntime_Microsoft )
_IOLBF = 0x40,
///
_IONBF = 4,
}

extern shared void function() _fcloseallp;

version( LDC_MSVCRT14 ) // requires MSVCRT >= 14 (VS 2015)
{
shared(FILE)* __acrt_iob_func(uint);
///
_IOREAD = 1, // non-standard
shared FILE* stdin; // = __acrt_iob_func(0);
///
_IOWRT = 2, // non-standard
shared FILE* stdout; // = __acrt_iob_func(1);
///
_IOMYBUF = 8, // non-standard
shared FILE* stderr; // = __acrt_iob_func(2);
}
else
{
enum
{
///
_IOEOF = 0x10, // non-standard
_IOREAD = 1, // non-standard
///
_IOERR = 0x20, // non-standard
_IOWRT = 2, // non-standard
///
_IOSTRG = 0x40, // non-standard
_IOMYBUF = 8, // non-standard
///
_IORW = 0x80, // non-standard
_IOEOF = 0x10, // non-standard
///
_IOAPP = 0x200, // non-standard
_IOERR = 0x20, // non-standard
///
_IOSTRG = 0x40, // non-standard
///
_IORW = 0x80, // non-standard
///
_IOAPP = 0x200, // non-standard
///
_IOAPPEND = 0x200, // non-standard
}
}

extern shared void function() _fcloseallp;
shared(FILE)* __iob_func();

private extern shared FILE[_NFILE] _iob;

shared(FILE)* __iob_func();

///
shared FILE* stdin; // = &__iob_func()[0];
///
shared FILE* stdout; // = &__iob_func()[1];
///
shared FILE* stderr; // = &__iob_func()[2];
///
shared FILE* stdin; // = &__iob_func()[0];
///
shared FILE* stdout; // = &__iob_func()[1];
///
shared FILE* stderr; // = &__iob_func()[2];
}
}
else version( linux )
{
Expand Down Expand Up @@ -802,6 +842,15 @@ version (MinGW)
}
else
{
version (LDC_MSVCRT14)
{
// MS define the *printf and *scanf function families inline
// starting with VS 2015 and its breaking changes.
// Link against a lib provided by MS containing appropriate
// implementations.
pragma(lib, "legacy_stdio_definitions.lib");
}

///
int fprintf(FILE* stream, in char* format, ...);
///
Expand Down Expand Up @@ -941,21 +990,46 @@ else version( CRuntime_DigitalMars )
}
else version( CRuntime_Microsoft )
{
// No unsafe pointer manipulation.
extern (D) @trusted
version( LDC_MSVCRT14 ) // requires MSVCRT >= 14 (VS 2015)
{
///
void rewind(FILE* stream) { fseek(stream,0L,SEEK_SET); stream._flag = stream._flag & ~_IOERR; }
///
pure void clearerr(FILE* stream) { stream._flag = stream._flag & ~(_IOERR|_IOEOF); }
///
pure int feof(FILE* stream) { return stream._flag&_IOEOF; }
// No unsafe pointer manipulation.
@trusted
{
///
void rewind(FILE* stream);
///
pure void clearerr(FILE* stream);
///
pure int feof(FILE* stream);
///
pure int ferror(FILE* stream);
///
pure int fileno(FILE* stream);
}

///
pure int ferror(FILE* stream) { return stream._flag&_IOERR; }
int vsnprintf(char* s, size_t n, in char* format, va_list args);
///
pure int fileno(FILE* stream) { return stream._file; }
int snprintf(char* s, size_t n, in char* format, ...);
}
///
else
{
// No unsafe pointer manipulation.
extern (D) @trusted
{
///
void rewind(FILE* stream) { fseek(stream, 0L, SEEK_SET); stream._flag = stream._flag & ~_IOERR; }
///
pure void clearerr(FILE* stream) { stream._flag = stream._flag & ~(_IOERR | _IOEOF); }
///
pure int feof(FILE* stream) { return stream._flag & _IOEOF; }
///
pure int ferror(FILE* stream) { return stream._flag & _IOERR; }
///
pure int fileno(FILE* stream) { return stream._file; }
}

///
int _snprintf(char* s, size_t n, in char* fmt, ...);
///
alias _snprintf snprintf;
Expand Down Expand Up @@ -1002,6 +1076,7 @@ else version( CRuntime_Microsoft )
else
return _filbuf(fp);
}
}

///
int _lock_file(FILE *fp);
Expand Down
21 changes: 15 additions & 6 deletions src/rt/dmain2.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,22 @@ extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc)
}
version (CRuntime_Microsoft)
{
auto fp = __iob_func();
stdin = &fp[0];
stdout = &fp[1];
stderr = &fp[2];
static if (__traits(compiles, __acrt_iob_func(0))) // requires MSVCRT >= 14 (VS 2015)
{
stdin = __acrt_iob_func(0);
stdout = __acrt_iob_func(1);
stderr = __acrt_iob_func(2);
}
else
{
auto fp = __iob_func();
stdin = &fp[0];
stdout = &fp[1];
stderr = &fp[2];

// ensure that sprintf generates only 2 digit exponent when writing floating point values
_set_output_format(_TWO_DIGIT_EXPONENT);
// ensure that *printf generates only 2 digit exponent when writing floating point values
_set_output_format(_TWO_DIGIT_EXPONENT);
}

// enable full precision for reals
version(Win64)
Expand Down