6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-24 08:24:33 +00:00
Code Issues Projects Releases Wiki Activity

Fold the exception actions table harder: if two typeid lists start the

Browse Source 
same, only output one copy of the common part.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37470 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan Sands
2007-06-06 15:37:31 +00:00
parent 51e844b601
commit b32edb4b22
1 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
lib/CodeGen/DwarfWriter.cpp
View File

@ -2894,36 +2894,32 @@ private:
O << UsedDirective << EHFrameInfo.FnName << ".eh\n\n"; O << UsedDirective << EHFrameInfo.FnName << ".eh\n\n";
} }
/// EquivPads - Whether two landing pads have equivalent actions. /// SharedTypeIds - How many leading type ids two landing pads have in common.
static bool EquivPads(const LandingPadInfo *L, const LandingPadInfo *R) { static unsigned SharedTypeIds(const LandingPadInfo *L,
const std::vector<int> &LIds = L->TypeIds; const LandingPadInfo *R) {
const std::vector<int> &RIds = R->TypeIds; const std::vector<int> &LIds = L->TypeIds, &RIds = R->TypeIds;
unsigned LSize = LIds.size(), RSize = RIds.size(); unsigned LSize = LIds.size(), RSize = RIds.size();
unsigned MinSize = LSize < RSize ? LSize : RSize;
unsigned Count = 0;
if (LSize != RSize) for (; Count != MinSize; ++Count)
return false; if (LIds[Count] != RIds[Count])
return Count;
for (unsigned i = 0; i != LSize; ++i) return Count;
if (LIds[i] != RIds[i])
return false;
return true;
} }
/// PadLT - An order on landing pads, with EquivPads as order equivalence. /// PadLT - Order landing pads lexicographically by type id.
static bool PadLT(const LandingPadInfo *L, const LandingPadInfo *R) { static bool PadLT(const LandingPadInfo *L, const LandingPadInfo *R) {
const std::vector<int> &LIds = L->TypeIds; const std::vector<int> &LIds = L->TypeIds, &RIds = R->TypeIds;
const std::vector<int> &RIds = R->TypeIds;
unsigned LSize = LIds.size(), RSize = RIds.size(); unsigned LSize = LIds.size(), RSize = RIds.size();
unsigned MinSize = LSize < RSize ? LSize : RSize;
if (LSize != RSize) for (unsigned i = 0; i != MinSize; ++i)
return LSize < RSize;
for (unsigned i = 0; i != LSize; ++i)
if (LIds[i] != RIds[i]) if (LIds[i] != RIds[i])
return LIds[i] < RIds[i]; return LIds[i] < RIds[i];
return false; // Equivalent return LSize < RSize;
} }
/// EmitExceptionTable - Emit landpads and actions. /// EmitExceptionTable - Emit landpads and actions.
@ -2960,6 +2956,12 @@ private:
typedef DenseMap<unsigned, PadSite, KeyInfo> PadMapType; typedef DenseMap<unsigned, PadSite, KeyInfo> PadMapType;
struct ActionEntry {
int TypeID;
int NextAction;
struct ActionEntry *Previous;
};
void EmitExceptionTable() { void EmitExceptionTable() {
// Map all labels and get rid of any dead landing pads. // Map all labels and get rid of any dead landing pads.
MMI->TidyLandingPads(); MMI->TidyLandingPads();
@ -2977,7 +2979,10 @@ private:
std::sort(LandingPads.begin(), LandingPads.end(), PadLT); std::sort(LandingPads.begin(), LandingPads.end(), PadLT);
// Gather first action index for each landing pad site. // Gather first action index for each landing pad site.
SmallVector<unsigned, 32> Actions; SmallVector<unsigned, 32> FirstActions;
// The actions table.
SmallVector<ActionEntry, 64> Actions;
// Compute sizes for exception table. // Compute sizes for exception table.
unsigned SizeSites = 0; unsigned SizeSites = 0;
@ -2985,38 +2990,55 @@ private:
// Look at each landing pad site to compute size. We need the size of each // Look at each landing pad site to compute size. We need the size of each
// landing pad site info and the size of the landing pad's actions. // landing pad site info and the size of the landing pad's actions.
signed FirstAction = 0; int FirstAction = 0;
for (unsigned i = 0, N = LandingPads.size(); i != N; ++i) { for (unsigned i = 0, N = LandingPads.size(); i != N; ++i) {
const LandingPadInfo *LandingPad = LandingPads[i]; const LandingPadInfo *LP = LandingPads[i];
const std::vector<int> &TypeIds = LP->TypeIds;
const unsigned NumShared = i ? SharedTypeIds(LP, LandingPads[i-1]) : 0;
unsigned SizeSiteActions = 0; unsigned SizeSiteActions = 0;
if (!i || !EquivPads(LandingPad, LandingPads[i-1])) { if (NumShared < TypeIds.size()) {
const std::vector<int> &TypeIds = LandingPad->TypeIds;
unsigned SizeAction = 0; unsigned SizeAction = 0;
ActionEntry *PrevAction = 0;
if (TypeIds.empty()) { if (NumShared) {
FirstAction = 0; const unsigned SizePrevIds = LandingPads[i-1]->TypeIds.size();
} else { assert(Actions.size());
// Gather the action sizes PrevAction = &Actions.back();
for (unsigned j = 0, M = TypeIds.size(); j != M; ++j) { SizeAction = Asm->SizeSLEB128(PrevAction->NextAction) +
int TypeID = TypeIds[j]; Asm->SizeSLEB128(PrevAction->TypeID);
unsigned SizeTypeID = Asm->SizeSLEB128(TypeID); for (unsigned j = NumShared; j != SizePrevIds; ++j) {
signed Action = j ? -(SizeAction + SizeTypeID) : 0; SizeAction -= Asm->SizeSLEB128(PrevAction->TypeID);
SizeAction = SizeTypeID + Asm->SizeSLEB128(Action); SizeAction += -PrevAction->NextAction;
SizeSiteActions += SizeAction; PrevAction = PrevAction->Previous;
} }
// Record the first action of the landing pad site.
FirstAction = SizeActions + SizeSiteActions - SizeAction + 1;
} }
} // else re-use previous FirstAction
Actions.push_back(FirstAction); // Compute the actions.
for (unsigned I = NumShared, M = TypeIds.size(); I != M; ++I) {
int TypeID = TypeIds[I];
unsigned SizeTypeID = Asm->SizeSLEB128(TypeID);
int NextAction = SizeAction ? -(SizeAction + SizeTypeID) : 0;
SizeAction = SizeTypeID + Asm->SizeSLEB128(NextAction);
SizeSiteActions += SizeAction;
ActionEntry Action = {TypeID, NextAction, PrevAction};
Actions.push_back(Action);
PrevAction = &Actions.back();
}
// Record the first action of the landing pad site.
FirstAction = SizeActions + SizeSiteActions - SizeAction + 1;
} // else identical - re-use previous FirstAction
FirstActions.push_back(FirstAction);
// Compute this sites contribution to size. // Compute this sites contribution to size.
SizeActions += SizeSiteActions; SizeActions += SizeSiteActions;
unsigned M = LandingPad->BeginLabels.size(); unsigned M = LP->BeginLabels.size();
SizeSites += M*(sizeof(int32_t) + // Site start. SizeSites += M*(sizeof(int32_t) + // Site start.
sizeof(int32_t) + // Site length. sizeof(int32_t) + // Site length.
sizeof(int32_t) + // Landing pad. sizeof(int32_t) + // Landing pad.
@ -3111,29 +3133,19 @@ private:
} }
Asm->EOL("Landing pad"); Asm->EOL("Landing pad");
Asm->EmitULEB128Bytes(Actions[P.PadIndex]); Asm->EmitULEB128Bytes(FirstActions[P.PadIndex]);
Asm->EOL("Action"); Asm->EOL("Action");
} }
} }
// Emit the actions. // Emit the actions.
for (unsigned i = 0, N = LandingPads.size(); i != N; ++i) { for (unsigned I = 0, N = Actions.size(); I != N; ++I) {
if (!i || Actions[i] != Actions[i-1]) { ActionEntry &Action = Actions[I];
const LandingPadInfo *LandingPad = LandingPads[i];
const std::vector<int> &TypeIds = LandingPad->TypeIds;
unsigned SizeAction = 0;
for (unsigned j = 0, M = TypeIds.size(); j < M; ++j) { Asm->EmitSLEB128Bytes(Action.TypeID);
int TypeID = TypeIds[j]; Asm->EOL("TypeInfo index");
unsigned SizeTypeID = Asm->SizeSLEB128(TypeID); Asm->EmitSLEB128Bytes(Action.NextAction);
Asm->EmitSLEB128Bytes(TypeID); Asm->EOL("Next action");
Asm->EOL("TypeInfo index");
signed Action = j ? -(SizeAction + SizeTypeID) : 0;
SizeAction = SizeTypeID + Asm->SizeSLEB128(Action);
Asm->EmitSLEB128Bytes(Action);
Asm->EOL("Next action");
}
}
} }
// Emit the type ids. // Emit the type ids.