Skip to content

convert gflow.c to D #8424

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
wilzbach merged 1 commit into from
Jul 1, 2018
Merged

convert gflow.c to D #8424

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
920 changes: 469 additions & 451 deletions src/dmd/backend/gflow.c → src/dmd/backend/gflow.d
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/dmd/backend/gloop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,8 @@ STATIC void markinvar(elem *n,vec_t rd)
* e = defnod[] entry that is an assignment to a variable
*/

extern "C"
{
void fillInDNunambig(vec_t v, elem *e)
Copy link
Copy Markdown
Contributor

@wilzbach wilzbach Jul 1, 2018

Choose a reason for hiding this comment

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

Isn't this change unrelated?

Copy link
Copy Markdown
Member Author

@WalterBright WalterBright Jul 1, 2018

Choose a reason for hiding this comment

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

No. I set it to C to avoid name mangling issues with vec_t which is our annoying friend size_t.

{
assert(OTassign(e->Eoper));
Expand Down Expand Up @@ -1307,6 +1309,7 @@ void fillInDNunambig(vec_t v, elem *e)
}
}
}
}

/********************
* Update rd vector.
Expand Down
2 changes: 1 addition & 1 deletion src/dmd/backend/go.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void localize();
int blockinit();
void compdom();
void loopopt();
void fillInDNunambig(vec_t v, elem *e);
extern "C" { void fillInDNunambig(vec_t v, elem *e); }
extern "C" { void updaterd(elem *n,vec_t GEN,vec_t KILL); }

/* gother.c */
Expand Down
2 changes: 1 addition & 1 deletion src/dmd/backend/goh.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void localize();
int blockinit();
void compdom();
void loopopt();
void fillInDNunambig(vec_t v, elem *e);
extern (C) void fillInDNunambig(vec_t v, elem *e);
extern (C) void updaterd(elem *n,vec_t GEN,vec_t KILL);

/* gother.c */
Expand Down
6 changes: 3 additions & 3 deletions src/posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ else
endif
endif

BACK_OBJS = go.o gflow.o gloop.o var.o el.o \
BACK_OBJS = go.o gloop.o var.o el.o \
os.o nteh.o fp.o cgcs.o \
rtlsym.o cgelem.o cgen.o cgreg.o out.o \
blockopt.o cg.o type.o dt.o \
Expand All @@ -360,7 +360,7 @@ BACK_OBJS = go.o gflow.o gloop.o var.o el.o \
ph2.o util2.o tk.o strtold.o md5.o \
$(TARGET_OBJS)

BACK_DOBJS = bcomplex.o evalu8.o divcoeff.o dvec.o gsroa.o glocal.o gdag.o gother.o
BACK_DOBJS = bcomplex.o evalu8.o divcoeff.o dvec.o gsroa.o glocal.o gdag.o gother.o gflow.o

G_OBJS = $(addprefix $G/, $(BACK_OBJS))
G_DOBJS = $(addprefix $G/, $(BACK_DOBJS))
Expand Down Expand Up @@ -395,7 +395,7 @@ BACK_SRC = \
$C/compress.c $C/cgreg.c $C/var.c $C/strtold.c \
$C/cgsched.c $C/cod1.c $C/cod2.c $C/cod3.c $C/cod4.c $C/cod5.c \
$C/code.c $C/symbol.c $C/debug.c $C/dt.c $C/ee.c $C/el.c \
$C/evalu8.d $C/fp.c $C/go.c $C/gflow.c $C/gdag.d \
$C/evalu8.d $C/fp.c $C/go.c $C/gflow.d $C/gdag.d \
$C/gother.d $C/glocal.d $C/gloop.c $C/gsroa.d $C/newman.c \
$C/nteh.c $C/os.c $C/out.c $C/outbuf.c $C/ptrntab.c $C/rtlsym.c \
$C/type.c $C/melf.h $C/mach.h $C/mscoff.h $C/bcomplex.h \
Expand Down
1 change: 0 additions & 1 deletion src/vcbuild/dmd_backend.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
<ClCompile Include="..\dmd\backend\el.c" />
<ClCompile Include="..\dmd\backend\elfobj.c" />
<ClCompile Include="..\dmd\backend\fp.c" />
<ClCompile Include="..\dmd\backend\gflow.c" />
<ClCompile Include="..\dmd\backend\gloop.c" />
<ClCompile Include="..\dmd\backend\go.c" />
<ClCompile Include="..\dmd\backend\machobj.c" />
Expand Down
3 changes: 0 additions & 3 deletions src/vcbuild/dmd_backend.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@
<ClCompile Include="..\dmd\backend\fp.c">
<Filter>dmd\backend</Filter>
</ClCompile>
<ClCompile Include="..\dmd\backend\gflow.c">
<Filter>dmd\backend</Filter>
</ClCompile>
<ClCompile Include="..\dmd\backend\gloop.c">
<Filter>dmd\backend</Filter>
</ClCompile>
Expand Down
6 changes: 3 additions & 3 deletions src/win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ BACKSRC= $C\cdef.h $C\cc.h $C\oper.h $C\ty.h $C\optabgen.c \
$C\compress.c $C\cgreg.c $C\var.c \
$C\cgsched.c $C\cod1.c $C\cod2.c $C\cod3.c $C\cod4.c $C\cod5.c \
$C\code.c $C\symbol.c $C\debug.c $C\dt.c $C\ee.c $C\el.c \
$C\evalu8.d $C\fp.c $C\go.c $C\gflow.c $C\gdag.d \
$C\evalu8.d $C\fp.c $C\go.c $C\gflow.d $C\gdag.d \
$C\gother.d $C\glocal.d $C\gloop.c $C\gsroa.d $C\newman.c \
$C\nteh.c $C\os.c $C\out.c $C\outbuf.c $C\ptrntab.c $C\rtlsym.c \
$C\type.c $C\melf.h $C\mach.h $C\mscoff.h $C\bcomplex.h \
Expand Down Expand Up @@ -544,8 +544,8 @@ $G/fp.obj : $C\fp.c
$G/go.obj : $C\go.c
$(CC) -c -o$@ $(MFLAGS) $C\go

$G/gflow.obj : $C\gflow.c
$(CC) -c -o$@ $(MFLAGS) $C\gflow
$G/gflow.obj : $C\gflow.d
$(HOST_DC) -c -of$@ $(DFLAGS) -betterC -mv=dmd.backend=$C $C\gflow

$G/gdag.obj : $C\gdag.d
$(HOST_DC) -c -of$@ $(DFLAGS) -betterC -mv=dmd.backend=$C $C\gdag
Expand Down