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

don't misencode CC#'s

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24219 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2005-11-06 07:46:13 +00:00
parent e73bd45c1d
commit 54b369e752
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Bytecode/Reader/Reader.cpp
View File

@@ -1999,7 +1999,7 @@ void BytecodeReader::ParseModuleGlobalInfo() {
CC |= ((ExtWord >> 5) & 15) << 4; CC |= ((ExtWord >> 5) & 15) << 4;
} }
Func->setCallingConv(CC); Func->setCallingConv(CC-1);
Func->setAlignment(Alignment); Func->setAlignment(Alignment);
if (Handler) Handler->handleFunctionDeclaration(Func); if (Handler) Handler->handleFunctionDeclaration(Func);

7
lib/Bytecode/Writer/Writer.cpp
View File

@@ -968,12 +968,13 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
assert(Slot != -1 && "Module slot calculator is broken!"); assert(Slot != -1 && "Module slot calculator is broken!");
assert(Slot >= Type::FirstDerivedTyID && "Derived type not in range!"); assert(Slot >= Type::FirstDerivedTyID && "Derived type not in range!");
assert(((Slot << 6) >> 6) == Slot && "Slot # too big!"); 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. if (I->isExternal()) // If external, we don't have an FunctionInfo block.
ID |= 1 << 4; ID |= 1 << 4;
if (I->getAlignment() || I->getCallingConv() & ~15) if (I->getAlignment() || (CC & ~15) != 0)
ID |= 1 << 31; // Do we need an extension word? ID |= 1 << 31; // Do we need an extension word?
output_vbr(ID); output_vbr(ID);
@@ -981,7 +982,7 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
if (ID & (1 << 31)) { if (ID & (1 << 31)) {
// Extension byte: bits 0-4 = alignment, bits 5-9 = top nibble of calling // Extension byte: bits 0-4 = alignment, bits 5-9 = top nibble of calling
// convention. // convention.
ID = (Log2_32(I->getAlignment())+1) | ((I->getCallingConv() >> 4) << 5); ID = (Log2_32(I->getAlignment())+1) | ((CC >> 4) << 5);
output_vbr(ID); output_vbr(ID);
} }
} }