Skip to content

Commit 50d8559

Browse files
author
anoopkg6
committed
Make Stub block alignment 16-bit and some minor clean up
1 parent dbfe1d7 commit 50d8559

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

llvm/include/llvm/ExecutionEngine/JITLink/systemz.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ enum EdgeKind_systemz : Edge::Kind {
122122
///
123123
Delta16,
124124

125-
/// A 32-bit delta.
125+
/// A 32-bit delta shifted by 1.
126126
///
127127
/// Delta from the fixup to the target.
128128
///
129129
/// Fixup expression:
130-
/// Fixup <- (Target - Fixup + Addend : int32) >> 1
130+
/// Fixup <- (Target - Fixup + Addend) >> 1 : int32
131131
///
132132
/// Errors:
133133
/// - The result of the fixup expression before shifting right by 1 must
@@ -137,12 +137,12 @@ enum EdgeKind_systemz : Edge::Kind {
137137
///
138138
Delta32dbl,
139139

140-
/// A 24-bit delta.
140+
/// A 24-bit delta shifted by 1.
141141
///
142142
/// Delta from the fixup to the target.
143143
///
144144
/// Fixup expression:
145-
/// Fixup <- (Target - Fixup + Addend : int24) >> 1
145+
/// Fixup <- (Target - Fixup + Addend) >> 1 : int24
146146
///
147147
/// Errors:
148148
/// - The result of the fixup expression before shifting right by 1 must
@@ -152,12 +152,12 @@ enum EdgeKind_systemz : Edge::Kind {
152152
///
153153
Delta24dbl,
154154

155-
/// A 16-bit delta.
155+
/// A 16-bit delta shifted by 1.
156156
///
157157
/// Delta from the fixup to the target.
158158
///
159159
/// Fixup expression:
160-
/// Fixup <- (Target - Fixup + Addend : int16) >> 1
160+
/// Fixup <- (Target - Fixup + Addend) >> 1 : int16
161161
///
162162
/// Errors:
163163
/// - The result of the fixup expression before shifting right by 1 must
@@ -167,12 +167,12 @@ enum EdgeKind_systemz : Edge::Kind {
167167
///
168168
Delta16dbl,
169169

170-
/// A 12-bit delta.
170+
/// A 12-bit delta shifted by 1.
171171
///
172172
/// Delta from the fixup to the target.
173173
///
174174
/// Fixup expression:
175-
/// Fixup <- (Target - Fixup + Addend : int12) >> 1
175+
/// Fixup <- (Target - Fixup + Addend) >> 1 : int12
176176
///
177177
/// Errors:
178178
/// - The result of the fixup expression before shifting right by 1 must
@@ -689,7 +689,7 @@ inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E,
689689
}
690690
case Delta32dblGOTBase: {
691691
assert(GOTSymbol && "No GOT section symbol");
692-
int64_t Value = (GOTBase + A - P);
692+
int64_t Value = GOTBase + A - P;
693693
if (!LLVM_UNLIKELY(isInt<33>(Value)))
694694
return makeTargetOutOfRangeError(G, B, E);
695695
if (!LLVM_UNLIKELY(isAlignmentCorrect(Value, 2)))
@@ -786,12 +786,12 @@ inline Symbol &createAnonymousPointer(LinkGraph &G, Section &PointerSection,
786786
/// Create a jump stub block that jumps via the pointer at the given symbol.
787787
///
788788
/// The stub block will have the following default values:
789-
/// alignment: 8-bit
789+
/// alignment: 16-bit
790790
/// alignment-offset: 0
791791
inline Block &createPointerJumpStubBlock(LinkGraph &G, Section &StubSection,
792792
Symbol &PointerSymbol) {
793793
auto &B = G.createContentBlock(StubSection, getStubBlockContent(G),
794-
orc::ExecutorAddr(), 8, 0);
794+
orc::ExecutorAddr(), 16, 0);
795795
B.addEdge(Delta32dbl, 2, PointerSymbol, 2);
796796
return B;
797797
}

0 commit comments

Comments
 (0)