mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-04-30 23:20:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring: Introduce TargetABI::reverseExplicitParams()

Browse source
This commit is contained in:
Martin Kinkelin 2018-05-30 22:26:25 +02:00
parent 92913d4c08
commit 29d609d63d
13 changed files with 19 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gen/abi-aarch64.cpp
View file

@ -57,12 +57,6 @@ struct AArch64TargetABI : TargetABI {
if (!arg->byref)
rewriteArgument(fty, *arg);
}
// extern(D): reverse parameter order for non variadics, for DMD-compliance
if (fty.type->linkage == LINKd && fty.type->varargs != 1 &&
fty.args.size() > 1) {
fty.reverseParams = true;
}
}
void rewriteArgument(IrFuncTy &fty, IrFuncTyArg &arg) override {

6
gen/abi-arm.cpp
View file

@ -84,12 +84,6 @@ struct ArmTargetABI : TargetABI {
if (!arg->byref)
rewriteArgument(fty, *arg);
}
// extern(D): reverse parameter order for non variadics, for DMD-compliance
if (fty.type->linkage == LINKd && fty.type->varargs != 1 &&
fty.args.size() > 1) {
fty.reverseParams = true;
}
}
void rewriteArgument(IrFuncTy &fty, IrFuncTyArg &arg) override {

6
gen/abi-mips64.cpp
View file

@ -57,12 +57,6 @@ struct MIPS64TargetABI : TargetABI {
rewriteArgument(fty, *arg);
}
}
// extern(D): reverse parameter order for non variadics, for DMD-compliance
if (fty.type->linkage == LINKd && fty.type->varargs != 1 &&
fty.args.size() > 1) {
fty.reverseParams = true;
}
}
void rewriteArgument(IrFuncTy &fty, IrFuncTyArg &arg) override {

1
gen/abi-nvptx.cpp
View file

@ -28,6 +28,7 @@ struct NVPTXTargetABI : TargetABI {
t = t->toBasetype();
return ((t->ty == Tsarray || t->ty == Tstruct) && t->size() > 64);
}
bool reverseExplicitParams(TypeFunction *) override { return false; }
void rewriteFunctionType(IrFuncTy &fty) override {
for (auto arg : fty.args) {
if (!arg->byref)

6
gen/abi-ppc.cpp
View file

@ -70,12 +70,6 @@ struct PPCTargetABI : TargetABI {
rewriteArgument(fty, *arg);
}
}
// extern(D): reverse parameter order for non variadics, for DMD-compliance
if (fty.type->linkage == LINKd && fty.type->varargs != 1 &&
fty.args.size() > 1) {
fty.reverseParams = true;
}
}
void rewriteArgument(IrFuncTy &fty, IrFuncTyArg &arg) override {

6
gen/abi-ppc64le.cpp
View file

@ -59,12 +59,6 @@ struct PPC64LETargetABI : TargetABI {
rewriteArgument(fty, *arg);
}
}
// extern(D): reverse parameter order for non variadics, for DMD-compliance
if (fty.type->linkage == LINKd && fty.type->varargs != 1 &&
fty.args.size() > 1) {
fty.reverseParams = true;
}
}
void rewriteArgument(IrFuncTy &fty, IrFuncTyArg &arg) override {

1
gen/abi-spirv.cpp
View file

@ -28,6 +28,7 @@ struct SPIRVTargetABI : TargetABI {
t = t->toBasetype();
return ((t->ty == Tsarray || t->ty == Tstruct) && t->size() > 64);
}
bool reverseExplicitParams(TypeFunction *) override { return false; }
void rewriteFunctionType(IrFuncTy &fty) override {
for (auto arg : fty.args) {
if (!arg->byref)

6
gen/abi-win64.cpp
View file

@ -120,12 +120,6 @@ public:
rewriteArgument(fty, *arg);
}
}
// extern(D): reverse parameter order for non variadics, for DMD-compliance
if (fty.type->linkage == LINKd && fty.type->varargs != 1 &&
fty.args.size() > 1) {
fty.reverseParams = true;
}
}
void rewriteVarargs(IrFuncTy &fty,

6
gen/abi-x86-64.cpp
View file

@ -319,12 +319,6 @@ void X86_64TargetABI::rewriteFunctionType(IrFuncTy &fty) {
Logger::println("x86-64 ABI: Transforming argument types");
LOG_SCOPE;
// extern(D): reverse parameter order for non variadics, for DMD-compliance
if (fty.type->linkage == LINKd && fty.type->varargs != 1 &&
fty.args.size() > 1) {
fty.reverseParams = true;
}
int begin = 0, end = fty.args.size(), step = 1;
if (fty.reverseParams) {
begin = end - 1;

5
gen/abi-x86.cpp
View file

@ -181,11 +181,6 @@ struct X86TargetABI : TargetABI {
}
// all other arguments are passed on the stack, don't rewrite
// reverse parameter order
if (fty.args.size() > 1) {
fty.reverseParams = true;
}
}
workaroundIssue1356(fty.args);

10
gen/abi.cpp
View file

@ -238,6 +238,14 @@ bool TargetABI::canRewriteAsInt(Type *t, bool include64bit) {
//////////////////////////////////////////////////////////////////////////////
bool TargetABI::reverseExplicitParams(TypeFunction *tf) {
// Required by druntime for extern(D), except for `, ...`-style variadics.
return tf->linkage == LINKd && tf->varargs != 1 &&
Parameter::dim(tf->parameters) > 1;
}
//////////////////////////////////////////////////////////////////////////////
void TargetABI::rewriteVarargs(IrFuncTy &fty,
std::vector<IrFuncTyArg *> &args) {
for (auto arg : args) {
@ -355,6 +363,8 @@ struct IntrinsicABI : TargetABI {
bool passByVal(Type *t) override { return false; }
bool reverseExplicitParams(TypeFunction *) override { return false; }
void rewriteArgument(IrFuncTy &fty, IrFuncTyArg &arg) override {
Type *ty = arg.type->toBasetype();
if (ty->ty != Tstruct) {

5
gen/abi.h
View file

@ -143,6 +143,11 @@ struct TargetABI {
/// argument.
virtual bool passThisBeforeSret(TypeFunction *tf) { return false; }
/// Returns true if the explicit parameters order is to be reversed.
/// Defaults to true for non-variadic extern(D) functions as required by
/// druntime.
virtual bool reverseExplicitParams(TypeFunction *tf);
/// Called to give ABI the chance to rewrite the types
virtual void rewriteFunctionType(IrFuncTy &fty) = 0;
virtual void rewriteVarargs(IrFuncTy &fty, std::vector<IrFuncTyArg *> &args);

2
gen/functions.cpp
View file

@ -187,6 +187,8 @@ llvm::FunctionType *DtoFunctionType(Type *type, IrFuncTy &irFty, Type *thistype,
++nextLLArgIdx;
}
newIrFty.reverseParams = abi->reverseExplicitParams(f);
// let the ABI rewrite the types as necessary
abi->rewriteFunctionType(newIrFty);