mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-21 11:38:35 +00:00
don't misencode CC#'s
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24219 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
e73bd45c1d
commit
54b369e752
@ -1999,7 +1999,7 @@ void BytecodeReader::ParseModuleGlobalInfo() {
|
||||
CC |= ((ExtWord >> 5) & 15) << 4;
|
||||
}
|
||||
|
||||
Func->setCallingConv(CC);
|
||||
Func->setCallingConv(CC-1);
|
||||
Func->setAlignment(Alignment);
|
||||
|
||||
if (Handler) Handler->handleFunctionDeclaration(Func);
|
||||
|
@ -968,12 +968,13 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
|
||||
assert(Slot != -1 && "Module slot calculator is broken!");
|
||||
assert(Slot >= Type::FirstDerivedTyID && "Derived type not in range!");
|
||||
assert(((Slot << 6) >> 6) == Slot && "Slot # too big!");
|
||||
unsigned ID = (Slot << 5) | (I->getCallingConv() & 15);
|
||||
unsigned CC = I->getCallingConv()+1;
|
||||
unsigned ID = (Slot << 5) | (CC & 15);
|
||||
|
||||
if (I->isExternal()) // If external, we don't have an FunctionInfo block.
|
||||
ID |= 1 << 4;
|
||||
|
||||
if (I->getAlignment() || I->getCallingConv() & ~15)
|
||||
if (I->getAlignment() || (CC & ~15) != 0)
|
||||
ID |= 1 << 31; // Do we need an extension word?
|
||||
|
||||
output_vbr(ID);
|
||||
@ -981,7 +982,7 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
|
||||
if (ID & (1 << 31)) {
|
||||
// Extension byte: bits 0-4 = alignment, bits 5-9 = top nibble of calling
|
||||
// convention.
|
||||
ID = (Log2_32(I->getAlignment())+1) | ((I->getCallingConv() >> 4) << 5);
|
||||
ID = (Log2_32(I->getAlignment())+1) | ((CC >> 4) << 5);
|
||||
output_vbr(ID);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user