maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

wean Blob handling logic off of banging on NextChar directly. Instead, make 

it reason about the current bit position, which is always independent of the
underlying cursors word size.

llvm-svn: 173063
This commit is contained in:
Chris Lattner 2013-01-21 18:18:25 +00:00
parent e1817aae5f
commit 9221b8fdac
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/lib/Bitcode/Reader/BitstreamReader.cpp
View File

@ -184,17 +184,17 @@ void BitstreamCursor::skipRecord(unsigned AbbrevID) {
SkipToFourByteBoundary(); // 32-bit alignment
// Figure out where the end of this blob will be including tail padding.
size_t NewEnd = NextChar+((NumElts+3)&~3);
size_t NewEnd = GetCurrentBitNo()+((NumElts+3)&~3)*8;
// If this would read off the end of the bitcode file, just set the
// record to empty and return.
if (!canSkipToPos(NewEnd)) {
if (!canSkipToPos(NewEnd/8)) {
NextChar = BitStream->getBitcodeBytes().getExtent();
break;
}
// Skip over the blob.
NextChar = NewEnd;
JumpToBit(NewEnd);
}
}
@ -244,11 +244,12 @@ unsigned BitstreamCursor::readRecord(unsigned AbbrevID,
SkipToFourByteBoundary(); // 32-bit alignment
// Figure out where the end of this blob will be including tail padding.
size_t NewEnd = NextChar+((NumElts+3)&~3);
size_t CurBitPos = GetCurrentBitNo();
size_t NewEnd = CurBitPos+((NumElts+3)&~3)*8;
// If this would read off the end of the bitcode file, just set the
// record to empty and return.
if (!canSkipToPos(NewEnd)) {
if (!canSkipToPos(NewEnd/8)) {
Vals.append(NumElts, 0);
NextChar = BitStream->getBitcodeBytes().getExtent();
break;
@ -259,14 +260,16 @@ unsigned BitstreamCursor::readRecord(unsigned AbbrevID,
if (Blob) {
*Blob =
StringRef((const char*)BitStream->getBitcodeBytes().getPointer(
NextChar, NumElts),
NumElts);
CurBitPos/8, NumElts),
NumElts);
} else {
for (; NumElts; ++NextChar, --NumElts)
Vals.push_back(getByte(NextChar));
// FIXME: This is a brutally inefficient way to do this. Why isn't this
// just using getPointer?
for (; NumElts; --NumElts)
Vals.push_back(Read(8));
}
// Skip over tail padding.
NextChar = NewEnd;
JumpToBit(NewEnd);
}
unsigned Code = (unsigned)Vals[0];