Skip to content

refactor: convert Obj.funcptr() to Obj.setModuleCtorDtor() #6957

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

Merged
dlang-bot merged 1 commit into from
Jul 3, 2017
Merged

refactor: convert Obj.funcptr() to Obj.setModuleCtorDtor() #6957

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
14 changes: 8 additions & 6 deletions src/ddmd/backend/cgobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,11 +1724,14 @@ void Obj::staticdtor(Symbol *s)


/***************************************
* Stuff pointer to function in its own segment.
* Used for static ctor and dtor lists.
* Set up function to be called as static constructor on program
Copy link
Member

@UplinkCoder UplinkCoder Jul 2, 2017

Choose a reason for hiding this comment

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

Stuff pointer to function in its own segment.

This is useful information.
please keep it.

* startup or static destructor on program shutdown.
* Params:
* s = function symbol
* isCtor = true if constructor, false if destructor
*/

void Obj::funcptr(Symbol *s)
void Obj::setModuleCtorDtor(Symbol *s, bool isCtor)
{
// We need to always put out the segments in triples, so that the
// linker will put them in the correct order.
Expand All @@ -1742,16 +1745,15 @@ void Obj::funcptr(Symbol *s)
static int lnamesize[4] = { 4+3+4,4+3+4,5+4+5,5+4+5 };

int dsegattr;
int i;

symbol_debug(s);
#ifdef DEBUG
#if defined(DEBUG) && SCPP
assert(memcmp(s->Sident,"_ST",3) == 0);
#endif

// Determine if constructor or destructor
// _STI... is a constructor, _STD... is a destructor
i = s->Sident[3] == 'D';
int i = !isCtor;
// Determine if near or far function
if (tyfarfunc(s->Stype->Tty))
i += 2;
Expand Down
4 changes: 2 additions & 2 deletions src/ddmd/backend/elfobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,9 +1639,9 @@ void Obj::staticdtor(Symbol *s)
* Used for static ctor and dtor lists.
*/

void Obj::funcptr(Symbol *s)
void Obj::setModuleCtorDtor(Symbol *s, bool isCtor)
{
//dbg_printf("Obj::funcptr(%s) \n",s->Sident);
//dbg_printf("Obj::setModuleCtorDtor(%s) \n",s->Sident);
}


Expand Down
4 changes: 2 additions & 2 deletions src/ddmd/backend/machobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1716,9 +1716,9 @@ void Obj::staticdtor(Symbol *s)
* Used for static ctor and dtor lists.
*/

void Obj::funcptr(Symbol *s)
void Obj::setModuleCtorDtor(Symbol *s, bool isCtor)
{
//dbg_printf("Obj::funcptr(%s) \n",s->Sident);
//dbg_printf("Obj::setModuleCtorDtor(%s) \n",s->Sident);
}


Expand Down
4 changes: 2 additions & 2 deletions src/ddmd/backend/mscoffobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,9 +1181,9 @@ void MsCoffObj::staticdtor(Symbol *s)
* Used for static ctor and dtor lists.
*/

void MsCoffObj::funcptr(Symbol *s)
void MsCoffObj::setModuleCtorDtor(Symbol *s, bool isCtor)
{
//dbg_printf("MsCoffObj::funcptr(%s) \n",s->Sident);
//dbg_printf("MsCoffObj::setModuleCtorDtor(%s) \n",s->Sident);
}


Expand Down
6 changes: 3 additions & 3 deletions src/ddmd/backend/obj.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Obj
void segment_group(targ_size_t codesize, targ_size_t datasize, targ_size_t cdatasize, targ_size_t udatasize);
void staticctor(Symbol *s,int dtor,int seg);
void staticdtor(Symbol *s);
void funcptr(Symbol *s);
void setModuleCtorDtor(Symbol *s, bool isCtor);
void ehtables(Symbol *sfunc,targ_size_t size,Symbol *ehsym);
void ehsections();
void moduleinfo(Symbol *scc);
Expand Down Expand Up @@ -128,7 +128,7 @@ class MsCoffObj : Obj
// void segment_group(targ_size_t codesize, targ_size_t datasize, targ_size_t cdatasize, targ_size_t udatasize);
override void staticctor(Symbol *s,int dtor,int seg);
override void staticdtor(Symbol *s);
override void funcptr(Symbol *s);
override void setModuleCtorDtor(Symbol *s, bool isCtor);
override void ehtables(Symbol *sfunc,targ_size_t size,Symbol *ehsym);
override void ehsections();
override void moduleinfo(Symbol *scc);
Expand Down Expand Up @@ -221,7 +221,7 @@ class Obj
static void segment_group(targ_size_t codesize, targ_size_t datasize, targ_size_t cdatasize, targ_size_t udatasize);
static void staticctor(Symbol *s,int dtor,int seg);
static void staticdtor(Symbol *s);
static void funcptr(Symbol *s);
static void setModuleCtorDtor(Symbol *s, bool isCtor);
static void ehtables(Symbol *sfunc,targ_size_t size,Symbol *ehsym);
static void ehsections();
static void moduleinfo(Symbol *scc);
Expand Down
4 changes: 2 additions & 2 deletions src/ddmd/backend/obj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Obj
VIRTUAL void segment_group(targ_size_t codesize, targ_size_t datasize, targ_size_t cdatasize, targ_size_t udatasize);
VIRTUAL void staticctor(Symbol *s,int dtor,int seg);
VIRTUAL void staticdtor(Symbol *s);
VIRTUAL void funcptr(Symbol *s);
VIRTUAL void setModuleCtorDtor(Symbol *s, bool isCtor);
VIRTUAL void ehtables(Symbol *sfunc,targ_size_t size,Symbol *ehsym);
VIRTUAL void ehsections();
VIRTUAL void moduleinfo(Symbol *scc);
Expand Down Expand Up @@ -161,7 +161,7 @@ class MsCoffObj : public Obj
// VIRTUAL void segment_group(targ_size_t codesize, targ_size_t datasize, targ_size_t cdatasize, targ_size_t udatasize);
VIRTUAL void staticctor(Symbol *s,int dtor,int seg);
VIRTUAL void staticdtor(Symbol *s);
VIRTUAL void funcptr(Symbol *s);
VIRTUAL void setModuleCtorDtor(Symbol *s, bool isCtor);
VIRTUAL void ehtables(Symbol *sfunc,targ_size_t size,Symbol *ehsym);
VIRTUAL void ehsections();
VIRTUAL void moduleinfo(Symbol *scc);
Expand Down
2 changes: 1 addition & 1 deletion src/ddmd/backend/out.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,7 +1426,7 @@ STATIC void writefunc2(symbol *sfunc)
if (p[0] == '_' && p[1] == 'S' && p[2] == 'T' &&
(p[3] == 'I' || p[3] == 'D'))
#endif
objmod->funcptr(sfunc);
objmod->setModuleCtorDtor(sfunc, sfunc->Sident[3] == 'I');
}

Ldone:
Expand Down