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

Fix a bug in the X86 ABI. The size of a struct is different from the size of a

Browse source 
pointer to that struct...
This commit is contained in:
Frits van Bommel 2009-03-06 21:15:13 +01:00
parent 1c6c4bc361
commit 5af82ee8d3
4 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gen/abi.cpp
View file

@ -133,9 +133,9 @@ struct X86_struct_to_register : ABIRewrite
const LLType* t = LLIntegerType::get(dty->size()*8);
DtoLoad(DtoBitCast(mem, getPtrToType(t)));
}
const LLType* type(Type*, const LLType* t)
const LLType* type(Type* t, const LLType*)
{
size_t sz = getTypePaddedSize(t)*8;
size_t sz = t->size()*8;
return LLIntegerType::get(sz);
}
};
@ -178,6 +178,7 @@ struct X86TargetABI : TargetABI
// complex {re,im} -> {im,re}
if (rt->iscomplex())
{
Logger::println("Rewriting complex return value");
fty->ret->rewrite = &swapComplex;
}
@ -186,10 +187,12 @@ struct X86TargetABI : TargetABI
// mark this/nested params inreg
if (fty->arg_this)
{
Logger::println("Putting 'this' in register");
fty->arg_this->attrs = llvm::Attribute::InReg;
}
else if (fty->arg_nest)
{
Logger::println("Putting context ptr in register");
fty->arg_nest->attrs = llvm::Attribute::InReg;
}
// otherwise try to mark the last param inreg
@ -206,6 +209,7 @@ struct X86TargetABI : TargetABI
if (last->byref && !last->isByVal())
{
Logger::println("Putting last (byref) parameter in register");
last->attrs |= llvm::Attribute::InReg;
}
else if (!lastTy->isfloating() && (sz == 1 || sz == 2 || sz == 4)) // right?

20
gen/tocall.cpp
View file

@ -373,6 +373,16 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
else
{
Logger::println("doing normal arguments");
if (Logger::enabled()) {
Logger::println("Arguments so far: (%d)", (int)args.size());
Logger::indent();
for (size_t i = 0; i < args.size(); i++) {
Logger::cout() << *args[i] << '\n';
}
Logger::undent();
Logger::cout() << "Function type: " << tf->toChars() << '\n';
Logger::cout() << "LLVM functype: " << *callable->getType() << '\n';
}
size_t n = Argument::dim(tf->parameters);
@ -386,9 +396,19 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
assert(fnarg);
DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]);
if (Logger::enabled()) {
Logger::cout() << "Argument before ABI: " << *argval->getRVal() << '\n';
Logger::cout() << "Argument type before ABI: " << *DtoType(argval->getType()) << '\n';
}
// give the ABI a say
LLValue* arg = tf->fty->putParam(argval->getType(), i, argval);
if (Logger::enabled()) {
Logger::cout() << "Argument after ABI: " << *arg << '\n';
Logger::cout() << "Argument type after ABI: " << *arg->getType() << '\n';
}
int j = tf->fty->reverseParams ? beg + n - i - 1 : beg + i;
// Hack around LDC assuming structs are in memory:

2
gen/tollvm.cpp
View file

@ -578,7 +578,7 @@ LLValue* DtoBitCast(LLValue* v, const LLType* t, const char* name)
{
if (v->getType() == t)
return v;
assert(!(isaStruct(t) || isaStruct(v->getType())));
assert(!isaStruct(t));
return gIR->ir->CreateBitCast(v, t, name ? name : "tmp");
}

23
ir/irfunction.cpp
View file

@ -3,6 +3,7 @@
#include "gen/tollvm.h"
#include "gen/abi.h"
#include "gen/dvalue.h"
#include "gen/logger.h"
#include "ir/irfunction.h"
#include <sstream>
@ -27,32 +28,44 @@ IrFuncTyArg::IrFuncTyArg(Type* t, bool bref, unsigned a)
llvm::Value* IrFuncTy::putRet(Type* dty, DValue* val)
{
assert(!arg_sret);
if (ret->rewrite)
if (ret->rewrite) {
Logger::println("Rewrite: putRet");
LOG_SCOPE
return ret->rewrite->put(dty, val);
}
return val->getRVal();
}
llvm::Value* IrFuncTy::getRet(Type* dty, DValue* val)
{
assert(!arg_sret);
if (ret->rewrite)
if (ret->rewrite) {
Logger::println("Rewrite: getRet");
LOG_SCOPE
return ret->rewrite->get(dty, val);
}
return val->getRVal();
}
llvm::Value* IrFuncTy::putParam(Type* dty, int idx, DValue* val)
{
assert(idx >= 0 && idx < args.size() && "invalid putParam");
if (args[idx]->rewrite)
if (args[idx]->rewrite) {
Logger::println("Rewrite: putParam");
LOG_SCOPE
return args[idx]->rewrite->put(dty, val);
}
return val->getRVal();
}
llvm::Value* IrFuncTy::getParam(Type* dty, int idx, DValue* val)
{
assert(idx >= 0 && idx < args.size() && "invalid getParam");
if (args[idx]->rewrite)
if (args[idx]->rewrite) {
Logger::println("Rewrite: getParam (get)");
LOG_SCOPE
return args[idx]->rewrite->get(dty, val);
}
return val->getRVal();
}
@ -62,6 +75,8 @@ void IrFuncTy::getParam(Type* dty, int idx, DValue* val, llvm::Value* lval)
if (args[idx]->rewrite)
{
Logger::println("Rewrite: getParam (getL)");
LOG_SCOPE
args[idx]->rewrite->getL(dty, val, lval);
return;
}