Skip to content

Commit 08a71cd

Browse files
ibuclawdlang-bot
ibuclaw
authored and
dlang-bot
committed
machobj: Rename align_ to p2align where its value is computed as power of 2
1 parent d3ce2ff commit 08a71cd

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

‎compiler/src/dmd/backend/machobj.d‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -473,12 +473,12 @@ Obj MachObj_init(OutBuffer* objbuf, const(char)* filename, const(char)* csegname
473473
SegData.reset(); // recycle memory
474474
SegData.push(); // element 0 is reserved
475475

476-
int align_ = I64 ? 4 : 2; // align to 16 bytes for floating point
476+
int p2align = I64 ? 4 : 2; // align to 16 bytes for floating point
477477
MachObj_getsegment("__text", "__TEXT", 2, S_REGULAR | S_ATTR_PURE_INSTRUCTIONS | S_ATTR_SOME_INSTRUCTIONS);
478-
MachObj_getsegment("__data", "__DATA", align_, S_REGULAR); // DATA
479-
MachObj_getsegment("__const", "__TEXT", 2, S_REGULAR); // CDATA
480-
MachObj_getsegment("__bss", "__DATA", 4, S_ZEROFILL); // UDATA
481-
MachObj_getsegment("__const", "__DATA", align_, S_REGULAR); // CDATAREL
478+
MachObj_getsegment("__data", "__DATA", p2align, S_REGULAR); // DATA
479+
MachObj_getsegment("__const", "__TEXT", 2, S_REGULAR); // CDATA
480+
MachObj_getsegment("__bss", "__DATA", 4, S_ZEROFILL); // UDATA
481+
MachObj_getsegment("__const", "__DATA", p2align, S_REGULAR); // CDATAREL
482482

483483
dwarf_initfile(filename);
484484
return obj;
@@ -1302,18 +1302,18 @@ void MachObj_term(const(char)[] objfilename)
13021302
sym.n_strx = mach_addmangled(c.sym);
13031303
sym.n_value = c.size * c.count;
13041304
sym.n_type = N_EXT | N_UNDF;
1305-
int align_;
1305+
int p2align;
13061306
if (c.size < 2)
1307-
align_ = 0; // align_ is expressed as power of 2
1307+
p2align = 0; // p2align is expressed as power of 2
13081308
else if (c.size < 4)
1309-
align_ = 1;
1309+
p2align = 1;
13101310
else if (c.size < 8)
1311-
align_ = 2;
1311+
p2align = 2;
13121312
else if (c.size < 16)
1313-
align_ = 3;
1313+
p2align = 3;
13141314
else
1315-
align_ = 4;
1316-
sym.n_desc = cast(ushort)(align_ << 8);
1315+
p2align = 4;
1316+
sym.n_desc = cast(ushort)(p2align << 8);
13171317
sym.n_sect = 0;
13181318
if (I64)
13191319
fobjbuf.write(&sym, sym.sizeof);
@@ -1577,11 +1577,11 @@ void MachObj_staticdtor(Symbol* s)
15771577
@trusted
15781578
void MachObj_setModuleCtorDtor(Symbol* sfunc, bool isCtor)
15791579
{
1580-
const align_ = I64 ? 3 : 2; // align to _tysize[TYnptr]
1580+
const p2align = I64 ? 3 : 2; // align to _tysize[TYnptr]
15811581

15821582
IDXSEC seg = isCtor
1583-
? getsegment2(seg_mod_init_func, "__mod_init_func", "__DATA", align_, S_MOD_INIT_FUNC_POINTERS)
1584-
: getsegment2(seg_mod_term_func, "__mod_term_func", "__DATA", align_, S_MOD_TERM_FUNC_POINTERS);
1583+
? getsegment2(seg_mod_init_func, "__mod_init_func", "__DATA", p2align, S_MOD_INIT_FUNC_POINTERS)
1584+
: getsegment2(seg_mod_term_func, "__mod_term_func", "__DATA", p2align, S_MOD_TERM_FUNC_POINTERS);
15851585

15861586
const int relflags = I64 ? CFoff | CFoffset64 : CFoff;
15871587
const int sz = MachObj_reftoident(seg, SegData[seg].SDoffset, sfunc, 0, relflags);
@@ -1604,9 +1604,9 @@ void MachObj_ehtables(Symbol* sfunc,uint size,Symbol* ehsym)
16041604
* otherwise the duplicates aren't removed.
16051605
*/
16061606

1607-
int align_ = I64 ? 3 : 2; // align to _tysize[TYnptr]
1607+
int p2align = I64 ? 3 : 2; // align to _tysize[TYnptr]
16081608
// The size is (FuncTable).sizeof in deh2.d
1609-
int seg = getsegment2(seg_deh_eh, "__deh_eh", "__DATA", align_, S_REGULAR);
1609+
int seg = getsegment2(seg_deh_eh, "__deh_eh", "__DATA", p2align, S_REGULAR);
16101610

16111611
OutBuffer* buf = SegData[seg].SDbuf;
16121612
if (I64)
@@ -1652,7 +1652,7 @@ int MachObj_comdat(Symbol* s)
16521652
{
16531653
const(char)* sectname;
16541654
const(char)* segname;
1655-
int align_;
1655+
int p2align;
16561656
int flags;
16571657

16581658
//printf("MachObj_comdat(Symbol* %s)\n",s.Sident.ptr);
@@ -1663,37 +1663,37 @@ int MachObj_comdat(Symbol* s)
16631663
{
16641664
sectname = "__textcoal_nt";
16651665
segname = "__TEXT";
1666-
align_ = 2; // 4 byte alignment
1666+
p2align = 2; // 4 byte alignment
16671667
flags = S_COALESCED | S_ATTR_PURE_INSTRUCTIONS | S_ATTR_SOME_INSTRUCTIONS;
1668-
s.Sseg = getsegment2(seg_textcoal_nt, sectname, segname, align_, flags);
1668+
s.Sseg = getsegment2(seg_textcoal_nt, sectname, segname, p2align, flags);
16691669
}
16701670
else if ((s.ty() & mTYLINK) == mTYweakLinkage)
16711671
{
16721672
s.Sfl = FL.data;
1673-
align_ = 4; // 16 byte alignment
1674-
MachObj_data_start(s, 1 << align_, s.Sseg);
1673+
p2align = 4; // 16 byte alignment
1674+
MachObj_data_start(s, 1 << p2align, s.Sseg);
16751675
}
16761676
else if ((s.ty() & mTYLINK) == mTYthread)
16771677
{
16781678
s.Sfl = FL.tlsdata;
1679-
align_ = 4;
1679+
p2align = 4;
16801680
if (I64)
16811681
s.Sseg = objmod.tlsseg().SDseg;
16821682
else
1683-
s.Sseg = getsegment2(seg_tlscoal_nt, "__tlscoal_nt", "__DATA", align_, S_COALESCED);
1684-
MachObj_data_start(s, 1 << align_, s.Sseg);
1683+
s.Sseg = getsegment2(seg_tlscoal_nt, "__tlscoal_nt", "__DATA", p2align, S_COALESCED);
1684+
MachObj_data_start(s, 1 << p2align, s.Sseg);
16851685
}
16861686
else
16871687
{
16881688
s.Sfl = FL.data;
16891689
sectname = "__datacoal_nt";
16901690
segname = "__DATA";
1691-
align_ = 4; // 16 byte alignment
1692-
s.Sseg = getsegment2(seg_datacoal_nt, sectname, segname, align_, S_COALESCED);
1693-
MachObj_data_start(s, 1 << align_, s.Sseg);
1691+
p2align = 4; // 16 byte alignment
1692+
s.Sseg = getsegment2(seg_datacoal_nt, sectname, segname, p2align, S_COALESCED);
1693+
MachObj_data_start(s, 1 << p2align, s.Sseg);
16941694
}
16951695
// find or create new segment
1696-
if (s.Salignment > (1 << align_))
1696+
if (s.Salignment > (1 << p2align))
16971697
SegData[s.Sseg].SDalignment = s.Salignment;
16981698
s.Soffset = SegData[s.Sseg].SDoffset;
16991699
if (s.Sfl == FL.data || s.Sfl == FL.tlsdata)
@@ -1722,13 +1722,13 @@ int MachObj_jmpTableSegment(Symbol* s)
17221722
/**********************************
17231723
* Get segment.
17241724
* Input:
1725-
* align_ segment alignment as power of 2
1725+
* p2align segment alignment as power of 2
17261726
* Returns:
17271727
* segment index of found or newly created segment
17281728
*/
17291729
@trusted
17301730
int MachObj_getsegment(const(char)* sectname, const(char)* segname,
1731-
int align_, int flags)
1731+
int p2align, int flags)
17321732
{
17331733
assert(strlen(sectname) <= 16);
17341734
assert(strlen(segname) <= 16);
@@ -1793,7 +1793,7 @@ int MachObj_getsegment(const(char)* sectname, const(char)* segname,
17931793
SECbuf.writezeros(section_64.sizeof);
17941794
strncpy(sec.sectname.ptr, sectname, 16);
17951795
strncpy(sec.segname.ptr, segname, 16);
1796-
sec._align = align_;
1796+
sec._align = p2align;
17971797
sec.flags = flags;
17981798
}
17991799
else
@@ -1802,7 +1802,7 @@ int MachObj_getsegment(const(char)* sectname, const(char)* segname,
18021802
SECbuf.writezeros(section.sizeof);
18031803
strncpy(sec.sectname.ptr, sectname, 16);
18041804
strncpy(sec.segname.ptr, segname, 16);
1805-
sec._align = align_;
1805+
sec._align = p2align;
18061806
sec.flags = flags;
18071807
}
18081808

@@ -1820,16 +1820,16 @@ int MachObj_getsegment(const(char)* sectname, const(char)* segname,
18201820
* seg = value to memoize if it is not already set
18211821
* sectname = section name
18221822
* segname = segment name
1823-
* align_ = section alignment
1823+
* p2align = section alignment as power of 2
18241824
* flags = S_????
18251825
* Returns:
18261826
* seg index
18271827
*/
18281828
int getsegment2(ref int seg, const(char)* sectname, const(char)* segname,
1829-
int align_, int flags)
1829+
int p2align, int flags)
18301830
{
18311831
if (seg == UNKNOWN)
1832-
seg = MachObj_getsegment(sectname, segname, align_, flags);
1832+
seg = MachObj_getsegment(sectname, segname, p2align, flags);
18331833
return seg;
18341834
}
18351835

@@ -2688,9 +2688,9 @@ int elf_align(targ_size_t size, int foffset)
26882688
@trusted
26892689
void MachObj_moduleinfo(Symbol* scc)
26902690
{
2691-
int align_ = I64 ? 3 : 2; // align to _tysize[TYnptr]
2691+
int p2align = I64 ? 3 : 2; // align to _tysize[TYnptr]
26922692

2693-
int seg = MachObj_getsegment("__minfodata", "__DATA", align_, S_REGULAR);
2693+
int seg = MachObj_getsegment("__minfodata", "__DATA", p2align, S_REGULAR);
26942694
//printf("MachObj_moduleinfo(%s) seg = %d:x%x\n", scc.Sident.ptr, seg, Offset(seg));
26952695

26962696
int flags = CFoff;

0 commit comments

Comments
 (0)