RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-28 06:27:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented deserialization of references. References are handled

Browse Source 
just like pointers, except that they cannot be backpatched.  This
means that references are essentially non-owning pointers where the
referred object must be deserialized prior to the reference being
deserialized.  Because of the nature of references, this ordering of
objects is always possible.

Fixed a bug in backpatching code (returning the backpatched pointer
would accidentally include a bit flag).

llvm-svn: 43570
This commit is contained in:
Ted Kremenek 2007-10-31 19:58:32 +00:00
parent f6f2eb1c4f
commit deeab7cc87
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/llvm/Bitcode/Deserialize.h
View File

@ -56,7 +56,7 @@ class Deserializer {
BPatchEntry(void* P) : Ptr(reinterpret_cast<uintptr_t>(P)) {}
bool hasFinalPtr() const { return Ptr & 0x1 ? true : false; }
bool hasFinalPtr() const { return Ptr & 0x1 ? false : true; }
void setFinalPtr(BPNode*& FreeList, void* P);
BPNode* getBPNode() const {
@ -69,7 +69,10 @@ class Deserializer {
Ptr = reinterpret_cast<uintptr_t>(N) | 0x1;
}
uintptr_t getRawPtr() const { return Ptr; }
uintptr_t getFinalPtr() const {
assert (!(Ptr & 0x1) && "Backpatch pointer not yet deserialized.");
return Ptr;
}
static inline bool isPod() { return true; }
};
@ -132,17 +135,30 @@ public:
}
template <typename T>
void ReadPtr(T*& PtrRef) { ReadUIntPtr(reinterpret_cast<uintptr_t&>(PtrRef));}
void ReadPtr(uintptr_t& PtrRef) { ReadUIntPtr(PtrRef); }
void ReadPtr(T*& PtrRef) {
ReadUIntPtr(reinterpret_cast<uintptr_t&>(PtrRef));
}
template <typename T>
void ReadPtr(const T*& PtrRef) {
ReadPtr(const_cast<T*&>(PtrRef));
}
void ReadUIntPtr(uintptr_t& PtrRef);
template <typename T>
T& ReadRef() {
T* p = reinterpret_cast<T*>(ReadInternalRefPtr());
return *p;
}
void RegisterPtr(unsigned PtrId, void* Ptr);
private:
void ReadRecord();
bool inRecord();
uintptr_t ReadInternalRefPtr();
};
} // end namespace llvm

14
lib/Bitcode/Reader/Deserialize.cpp
View File

@ -115,7 +115,7 @@ void Deserializer::ReadUIntPtr(uintptr_t& PtrRef) {
BPatchEntry& E = BPatchMap[PtrId];
if (E.hasFinalPtr())
PtrRef = E.getRawPtr();
PtrRef = E.getFinalPtr();
else {
// Register backpatch. Check the freelist for a BPNode.
BPNode* N;
@ -132,6 +132,18 @@ void Deserializer::ReadUIntPtr(uintptr_t& PtrRef) {
}
}
uintptr_t Deserializer::ReadInternalRefPtr() {
unsigned PtrId = ReadInt();
assert (PtrId != 0 && "References cannot refer the NULL address.");
BPatchEntry& E = BPatchMap[PtrId];
assert (E.hasFinalPtr() &&
"Cannot backpatch references. Object must be already deserialized.");
return E.getFinalPtr();
}
void Deserializer::BPatchEntry::setFinalPtr(BPNode*& FreeList, void* P) {
assert (!hasFinalPtr());