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

Rename NodeBase::{key,val} as {first,second} and swap the BranchNode arrays such

Browse Source 
that the noderefs are the first member in the object.

This is in preparation of detemplatization of tree navigation.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119879 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen 2010-11-20 00:48:57 +00:00
parent 20272a7c5a
commit a3b1082bb1
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
include/llvm/ADT/IntervalMap.h
View File

@ -170,8 +170,8 @@ typedef std::pair<unsigned,unsigned> IdxPair;
//--- Node Storage ---// //--- Node Storage ---//
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Both leaf and branch nodes store vectors of (key,value) pairs. // Both leaf and branch nodes store vectors of pairs.
// Leaves store ((KeyT, KeyT), ValT) pairs, branches use (KeyT, NodeRef). // Leaves store ((KeyT, KeyT), ValT) pairs, branches use (NodeRef, KeyT).
// //
// Keys and values are stored in separate arrays to avoid padding caused by // Keys and values are stored in separate arrays to avoid padding caused by
// different object alignments. This also helps improve locality of reference // different object alignments. This also helps improve locality of reference
@ -184,23 +184,22 @@ typedef std::pair<unsigned,unsigned> IdxPair;
// These are typical key and value sizes, the node branching factor (N), and // These are typical key and value sizes, the node branching factor (N), and
// wasted space when nodes are sized to fit in three cache lines (192 bytes): // wasted space when nodes are sized to fit in three cache lines (192 bytes):
// //
// KT VT N Waste Used by // T1 T2 N Waste Used by
// 4 4 24 0 Branch<4> (32-bit pointers) // 4 4 24 0 Branch<4> (32-bit pointers)
// 4 8 16 0 Branch<4> // 8 4 16 0 Leaf<4,4>, Branch<4>
// 8 4 16 0 Leaf<4,4>
// 8 8 12 0 Leaf<4,8>, Branch<8> // 8 8 12 0 Leaf<4,8>, Branch<8>
// 16 4 9 12 Leaf<8,4> // 16 4 9 12 Leaf<8,4>
// 16 8 8 0 Leaf<8,8> // 16 8 8 0 Leaf<8,8>
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
template <typename KT, typename VT, unsigned N> template <typename T1, typename T2, unsigned N>
class NodeBase { class NodeBase {
public: public:
enum { Capacity = N }; enum { Capacity = N };
KT key[N]; T1 first[N];
VT val[N]; T2 second[N];
/// copy - Copy elements from another node. /// copy - Copy elements from another node.
/// @param Other Node elements are copied from. /// @param Other Node elements are copied from.
@ -208,12 +207,12 @@ public:
/// @param j Beginning of the destination range in this. /// @param j Beginning of the destination range in this.
/// @param Count Number of elements to copy. /// @param Count Number of elements to copy.
template <unsigned M> template <unsigned M>
void copy(const NodeBase<KT, VT, M> &Other, unsigned i, void copy(const NodeBase<T1, T2, M> &Other, unsigned i,
unsigned j, unsigned Count) { unsigned j, unsigned Count) {
assert(i + Count <= M && "Invalid source range"); assert(i + Count <= M && "Invalid source range");
assert(j + Count <= N && "Invalid dest range"); assert(j + Count <= N && "Invalid dest range");
std::copy(Other.key + i, Other.key + i + Count, key + j); std::copy(Other.first + i, Other.first + i + Count, first + j);
std::copy(Other.val + i, Other.val + i + Count, val + j); std::copy(Other.second + i, Other.second + i + Count, second + j);
} }
/// moveLeft - Move elements to the left. /// moveLeft - Move elements to the left.
@ -232,8 +231,8 @@ public:
void moveRight(unsigned i, unsigned j, unsigned Count) { void moveRight(unsigned i, unsigned j, unsigned Count) {
assert(i <= j && "Use moveLeft shift elements left"); assert(i <= j && "Use moveLeft shift elements left");
assert(j + Count <= N && "Invalid range"); assert(j + Count <= N && "Invalid range");
std::copy_backward(key + i, key + i + Count, key + j + Count); std::copy_backward(first + i, first + i + Count, first + j + Count);
std::copy_backward(val + i, val + i + Count, val + j + Count); std::copy_backward(second + i, second + i + Count, second + j + Count);
} }
/// erase - Erase elements [i;j). /// erase - Erase elements [i;j).
@ -455,13 +454,13 @@ public:
template <typename KeyT, typename ValT, unsigned N, typename Traits> template <typename KeyT, typename ValT, unsigned N, typename Traits>
class LeafNode : public NodeBase<std::pair<KeyT, KeyT>, ValT, N> { class LeafNode : public NodeBase<std::pair<KeyT, KeyT>, ValT, N> {
public: public:
const KeyT &start(unsigned i) const { return this->key[i].first; } const KeyT &start(unsigned i) const { return this->first[i].first; }
const KeyT &stop(unsigned i) const { return this->key[i].second; } const KeyT &stop(unsigned i) const { return this->first[i].second; }
const ValT &value(unsigned i) const { return this->val[i]; } const ValT &value(unsigned i) const { return this->second[i]; }
KeyT &start(unsigned i) { return this->key[i].first; } KeyT &start(unsigned i) { return this->first[i].first; }
KeyT &stop(unsigned i) { return this->key[i].second; } KeyT &stop(unsigned i) { return this->first[i].second; }
ValT &value(unsigned i) { return this->val[i]; } ValT &value(unsigned i) { return this->second[i]; }
/// findFrom - Find the first interval after i that may contain x. /// findFrom - Find the first interval after i that may contain x.
/// @param i Starting index for the search. /// @param i Starting index for the search.
@ -635,14 +634,14 @@ extendStop(unsigned i, unsigned Size, KeyT b) {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
template <typename KeyT, typename ValT, unsigned N, typename Traits> template <typename KeyT, typename ValT, unsigned N, typename Traits>
class BranchNode : public NodeBase<KeyT, NodeRef<KeyT, ValT, Traits>, N> { class BranchNode : public NodeBase<NodeRef<KeyT, ValT, Traits>, KeyT, N> {
typedef NodeRef<KeyT, ValT, Traits> NodeRefT; typedef NodeRef<KeyT, ValT, Traits> NodeRefT;
public: public:
const KeyT &stop(unsigned i) const { return this->key[i]; } const KeyT &stop(unsigned i) const { return this->second[i]; }
const NodeRefT &subtree(unsigned i) const { return this->val[i]; } const NodeRefT &subtree(unsigned i) const { return this->first[i]; }
KeyT &stop(unsigned i) { return this->key[i]; } KeyT &stop(unsigned i) { return this->second[i]; }
NodeRefT &subtree(unsigned i) { return this->val[i]; } NodeRefT &subtree(unsigned i) { return this->first[i]; }
/// findFrom - Find the first subtree after i that may contain x. /// findFrom - Find the first subtree after i that may contain x.
/// @param i Starting index for the search. /// @param i Starting index for the search.