Skip to content

Move addDefaultVersionIdentifiers from mars.d to compiler.d #7524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RazvanN7 wants to merge 1 commit into from
Closed

Move addDefaultVersionIdentifiers from mars.d to compiler.d #7524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
136 changes: 136 additions & 0 deletions src/dmd/compiler.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,143 @@

module dmd.compiler;

import core.stdc.stdio;
import dmd.cond;
import dmd.globals;

struct Compiler
{
const(char)* vendor; // Compiler backend name
}

/**
* Add default `version` identifier for dmd, and set the
* target platform in `global`.
* https://dlang.org/spec/version.html#predefined-versions
*
* Needs to be run after all arguments parsing (command line, DFLAGS environment
* variable and config file) in order to add final flags (such as `X86_64` or
* the `CRuntime` used).
*/
void addDefaultVersionIdentifiers()
{
VersionCondition.addPredefinedGlobalIdent("DigitalMars");
static if (TARGET_WINDOS)
{
VersionCondition.addPredefinedGlobalIdent("Windows");
global.params.isWindows = true;
Copy link
Copy Markdown
Member

@WalterBright WalterBright Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should really not be here. "Setting predefined identifiers" and "setting the target platform in global" should be in different functions.

}
else static if (TARGET_LINUX)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("linux");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isLinux = true;
}
else static if (TARGET_OSX)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("OSX");
global.params.isOSX = true;
// For legacy compatibility
VersionCondition.addPredefinedGlobalIdent("darwin");
}
else static if (TARGET_FREEBSD)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("FreeBSD");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isFreeBSD = true;
}
else static if (TARGET_OPENBSD)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("OpenBSD");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isOpenBSD = true;
}
else static if (TARGET_SOLARIS)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("Solaris");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isSolaris = true;
}
else
{
static assert(0, "fix this");
Copy link
Copy Markdown
Member

@WalterBright WalterBright Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing a static assert failure is implied, so the message adds no value. "unsupported target" might be better.

}
VersionCondition.addPredefinedGlobalIdent("LittleEndian");
VersionCondition.addPredefinedGlobalIdent("D_Version2");
VersionCondition.addPredefinedGlobalIdent("all");

if (global.params.cpu >= CPU.sse2)
Copy link
Copy Markdown
Member

@WalterBright WalterBright Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note how this section is using global to set versions, whereas the previous section used TARGET to set it. Using TARGET to set global should be in a separate function, then this function should rely only on global to set versions.

Copy link
Copy Markdown
Member

@WalterBright WalterBright Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Furthermore, instead of accessing global as a global variable, consider passing a const reference to it to the function.

{
VersionCondition.addPredefinedGlobalIdent("D_SIMD");
if (global.params.cpu >= CPU.avx)
VersionCondition.addPredefinedGlobalIdent("D_AVX");
if (global.params.cpu >= CPU.avx2)
VersionCondition.addPredefinedGlobalIdent("D_AVX2");
}

if (global.params.is64bit)
{
VersionCondition.addPredefinedGlobalIdent("D_InlineAsm_X86_64");
VersionCondition.addPredefinedGlobalIdent("X86_64");
static if (TARGET_WINDOS)
{
VersionCondition.addPredefinedGlobalIdent("Win64");
}
}
else
{
VersionCondition.addPredefinedGlobalIdent("D_InlineAsm"); //legacy
VersionCondition.addPredefinedGlobalIdent("D_InlineAsm_X86");
VersionCondition.addPredefinedGlobalIdent("X86");
static if (TARGET_WINDOS)
{
VersionCondition.addPredefinedGlobalIdent("Win32");
}
}
static if (TARGET_WINDOS)
{
if (global.params.mscoff)
VersionCondition.addPredefinedGlobalIdent("CRuntime_Microsoft");
else
VersionCondition.addPredefinedGlobalIdent("CRuntime_DigitalMars");
}
else static if (TARGET_LINUX)
{
VersionCondition.addPredefinedGlobalIdent("CRuntime_Glibc");
}

if (global.params.isLP64)
VersionCondition.addPredefinedGlobalIdent("D_LP64");
if (global.params.doDocComments)
VersionCondition.addPredefinedGlobalIdent("D_Ddoc");
if (global.params.cov)
VersionCondition.addPredefinedGlobalIdent("D_Coverage");
if (global.params.pic)
VersionCondition.addPredefinedGlobalIdent("D_PIC");
if (global.params.useUnitTests)
VersionCondition.addPredefinedGlobalIdent("unittest");
if (global.params.useAssert == CHECKENABLE.on)
VersionCondition.addPredefinedGlobalIdent("assert");
if (global.params.useArrayBounds == CHECKENABLE.off)
VersionCondition.addPredefinedGlobalIdent("D_NoBoundsChecks");
if (global.params.betterC)
VersionCondition.addPredefinedGlobalIdent("D_BetterC");

VersionCondition.addPredefinedGlobalIdent("D_HardFloat");
}

void printPredefinedVersions()
{
if (global.params.verbose && global.params.versionids)
{
fprintf(global.stdmsg, "predefs ");
foreach (const s; *global.params.versionids)
fprintf(global.stdmsg, " %s", s);
fprintf(global.stdmsg, "\n");
}
}
20 changes: 3 additions & 17 deletions src/dmd/frontend.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,11 @@ void initDMD()
import dmd.expression : Expression;
import dmd.objc : Objc;
import dmd.builtin : builtin_init;
import dmd.compiler : addDefaultVersionIdentifiers, printPredefinedVersions;

global._init;

version(linux)
global.params.isLinux = 1;
else version(OSX)
global.params.isOSX = 1;
else version(FreeBSD)
global.params.isFreeBSD = 1;
else version(Windows)
global.params.isWindows = 1;
else version(Solaris)
global.params.isSolaris = 1;
else version(OpenBSD)
global.params.isOpenBSD = 1;
else
static assert(0, "OS not supported yet.");
Copy link
Copy Markdown
Member

@WalterBright WalterBright Jan 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see all this is deleted, but I don't see where it is moved to?

Copy link
Copy Markdown
Contributor Author

@RazvanN7 RazvanN7 Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that addDefaultVersionIdentifiers is called there is no need to do that since the code was duplicated from it initially.


addDefaultVersionIdentifiers();
Copy link
Copy Markdown
Member

@WalterBright WalterBright Jan 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

printPredefinedVersions() call should go here.

Copy link
Copy Markdown
Contributor Author

@RazvanN7 RazvanN7 Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

printPredefinedVersions();
Copy link
Copy Markdown
Contributor

@wilzbach wilzbach Jan 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure that we want to call printPredefinedVersions here at all?
After all, this is the frontend for DMD as a library code.

Type._init();
Id.initialize();
Module._init();
Expand All @@ -53,4 +40,3 @@ void initDMD()
Objc._init();
builtin_init();
}

141 changes: 4 additions & 137 deletions src/dmd/mars.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import dmd.arraytypes;
import dmd.astcodegen;
import dmd.gluelayer;
import dmd.builtin;
import dmd.compiler;
import dmd.cond;
import dmd.console;
import dmd.dinifile;
Expand Down Expand Up @@ -1211,143 +1212,6 @@ private void setDefaultLibrary()
global.params.debuglibname = global.params.defaultlibname;
}


/**
* Add default `version` identifier for dmd, and set the
* target platform in `global`.
* https://dlang.org/spec/version.html#predefined-versions
*
* Needs to be run after all arguments parsing (command line, DFLAGS environment
* variable and config file) in order to add final flags (such as `X86_64` or
* the `CRuntime` used).
*/
private void addDefaultVersionIdentifiers()
{
VersionCondition.addPredefinedGlobalIdent("DigitalMars");
static if (TARGET.Windows)
{
VersionCondition.addPredefinedGlobalIdent("Windows");
global.params.isWindows = true;
}
else static if (TARGET.Linux)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("linux");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isLinux = true;
}
else static if (TARGET.OSX)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("OSX");
global.params.isOSX = true;
// For legacy compatibility
VersionCondition.addPredefinedGlobalIdent("darwin");
}
else static if (TARGET.FreeBSD)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("FreeBSD");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isFreeBSD = true;
}
else static if (TARGET.OpenBSD)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("OpenBSD");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isOpenBSD = true;
}
else static if (TARGET.Solaris)
{
VersionCondition.addPredefinedGlobalIdent("Posix");
VersionCondition.addPredefinedGlobalIdent("Solaris");
VersionCondition.addPredefinedGlobalIdent("ELFv1");
global.params.isSolaris = true;
}
else
{
static assert(0, "fix this");
}
VersionCondition.addPredefinedGlobalIdent("LittleEndian");
VersionCondition.addPredefinedGlobalIdent("D_Version2");
VersionCondition.addPredefinedGlobalIdent("all");

if (global.params.cpu >= CPU.sse2)
{
VersionCondition.addPredefinedGlobalIdent("D_SIMD");
if (global.params.cpu >= CPU.avx)
VersionCondition.addPredefinedGlobalIdent("D_AVX");
if (global.params.cpu >= CPU.avx2)
VersionCondition.addPredefinedGlobalIdent("D_AVX2");
}

if (global.params.is64bit)
{
VersionCondition.addPredefinedGlobalIdent("D_InlineAsm_X86_64");
VersionCondition.addPredefinedGlobalIdent("X86_64");
static if (TARGET.Windows)
{
VersionCondition.addPredefinedGlobalIdent("Win64");
}
}
else
{
VersionCondition.addPredefinedGlobalIdent("D_InlineAsm"); //legacy
VersionCondition.addPredefinedGlobalIdent("D_InlineAsm_X86");
VersionCondition.addPredefinedGlobalIdent("X86");
static if (TARGET.Windows)
{
VersionCondition.addPredefinedGlobalIdent("Win32");
}
}
static if (TARGET.Windows)
{
if (global.params.mscoff)
VersionCondition.addPredefinedGlobalIdent("CRuntime_Microsoft");
else
VersionCondition.addPredefinedGlobalIdent("CRuntime_DigitalMars");
}
else static if (TARGET.Linux)
{
VersionCondition.addPredefinedGlobalIdent("CRuntime_Glibc");
}

if (global.params.isLP64)
VersionCondition.addPredefinedGlobalIdent("D_LP64");
if (global.params.doDocComments)
VersionCondition.addPredefinedGlobalIdent("D_Ddoc");
if (global.params.cov)
VersionCondition.addPredefinedGlobalIdent("D_Coverage");
if (global.params.pic)
VersionCondition.addPredefinedGlobalIdent("D_PIC");
if (global.params.useUnitTests)
VersionCondition.addPredefinedGlobalIdent("unittest");
if (global.params.useAssert == CHECKENABLE.on)
VersionCondition.addPredefinedGlobalIdent("assert");
if (global.params.useArrayBounds == CHECKENABLE.off)
VersionCondition.addPredefinedGlobalIdent("D_NoBoundsChecks");
if (global.params.betterC)
VersionCondition.addPredefinedGlobalIdent("D_BetterC");

VersionCondition.addPredefinedGlobalIdent("D_HardFloat");

printPredefinedVersions();
}

private void printPredefinedVersions()
{
if (global.params.verbose && global.versionids)
{
fprintf(global.stdmsg, "predefs ");
foreach (const str; *global.versionids)
fprintf(global.stdmsg, " %s", str.toChars);

fprintf(global.stdmsg, "\n");
}
}


/****************************************
* Determine the instruction set to be used.
* Params:
Expand Down Expand Up @@ -2160,6 +2024,7 @@ private bool parseCommandLine(const ref Strings arguments, const size_t argc, re
}
return errors;
}
<<<<<<< 1018db023831a8c348bb8f9121b08fabb6e32fc2


private __gshared bool includeImports = false;
Expand Down Expand Up @@ -2436,3 +2301,5 @@ private void parseModulePattern(const(char)* modulePattern, MatcherNode* dst, us
}
}
}
=======
>>>>>>> Move addDefaultVersionIdentifiers to frontend.d
Copy link
Copy Markdown
Member

@andralex andralex Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like some conflict made it into the pr

8 changes: 4 additions & 4 deletions src/posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ $G/backend.a: $(G_OBJS) $(SRC_MAKE)
$(AR) rcs $@ $(G_OBJS)

$G/lexer.a: $(LEXER_SRCS) $(LEXER_ROOT) $(HOST_DMD_PATH) $(SRC_MAKE)
CC="$(HOST_CXX)" $(HOST_DMD_RUN) -lib -of$@ $(MODEL_FLAG) -J$G -L-lstdc++ $(DFLAGS) $(LEXER_SRCS) $(LEXER_ROOT)
CC="$(HOST_CXX)" $(HOST_DMD_RUN) -lib -of$@ $(MODEL_FLAG) -J$G -J../res -L-lstdc++ $(DFLAGS) $(LEXER_SRCS) $(LEXER_ROOT)

$G/dmd_frontend: $(FRONT_SRCS) $D/gluelayer.d $(ROOT_SRCS) $G/newdelete.o $G/lexer.a $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
CC="$(HOST_CXX)" $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J../res -L-lstdc++ $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^) -version=NoBackend
Expand All @@ -466,13 +466,13 @@ unittest: $G/dmd-unittest
######## DMD as a library examples

EXAMPLES=$(addprefix $G/examples/, avg impvisitor)
PARSER_SRCS=$(addsuffix .d, $(addprefix $D/,parse astbase parsetimevisitor transitivevisitor permissivevisitor strictvisitor))
PARSER_SRCS=$(addsuffix .d, $(addprefix $D/,parse astbase compiler parsetimevisitor transitivevisitor permissivevisitor strictvisitor))

$G/parser.a: $(PARSER_SRCS) $(LEXER_SRCS) $(ROOT_SRCS) $G/dmd $G/dmd.conf $(SRC_MAKE)
CC="$(HOST_CXX)" $G/dmd -lib -of$@ $(MODEL_FLAG) -L-lstdc++ -J$G $(DFLAGS) $(PARSER_SRCS) $(LEXER_SRCS) $(ROOT_SRCS)
CC="$(HOST_CXX)" $G/dmd -lib -of$@ $(MODEL_FLAG) -L-lstdc++ -J$G -J../res $(DFLAGS) $(PARSER_SRCS) $(LEXER_SRCS) $(ROOT_SRCS)

$G/examples/%: $(EX)/%.d $G/parser.a $G/dmd
CC="$(HOST_CXX)" $G/dmd -of$@ $(MODEL_FLAG) $(DFLAGS) $G/parser.a $<
CC="$(HOST_CXX)" $G/dmd -of$@ $(MODEL_FLAG) -J../res $(DFLAGS) $G/parser.a $<

build-examples: $(EXAMPLES)

Expand Down