mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-17 21:29:20 +00:00
Implemented deserialization of references. References are handled
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). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43570 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
8aac61cff0
commit
eb9409dbb9
@ -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(T*& PtrRef) {
|
||||
ReadUIntPtr(reinterpret_cast<uintptr_t&>(PtrRef));
|
||||
}
|
||||
|
||||
void ReadPtr(uintptr_t& PtrRef) { ReadUIntPtr(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
|
||||
|
@ -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());
|
||||
|
Loading…
Reference in New Issue
Block a user