6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-09-28 06:58:19 +00:00
Code Issues Projects Releases Wiki Activity

Backing out r47521 for now. This has broken a number of tests.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47533 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng 2008-02-23 19:32:32 +00:00
parent a59d469e9b
commit 1df439773c
3 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -1337,30 +1337,17 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
}
case bitc::FUNC_CODE_INST_RET: // RET: [opty,opval<optional>]
{
unsigned Size = Record.size();
if (Size == 0) {
I = new ReturnInst();
break;
} else if (Size == 1) {
unsigned OpNum = 0;
Value *Op;
if (getValueTypePair(Record, OpNum, NextValueNo, Op) ||
OpNum != Record.size())
return Error("Invalid RET record");
I = new ReturnInst(Op);
break;
} else {
std::vector<Value *> Vs;
Value *Op;
unsigned OpNum = 0;
for (unsigned i = 0; i < Size; ++i) {
getValueTypePair(Record, OpNum, NextValueNo, Op);
Vs.push_back(Op);
}
I = new ReturnInst(Vs);
break;
}
if (Record.empty()) {
I = new ReturnInst();
break;
} else {
unsigned OpNum = 0;
Value *Op;
if (getValueTypePair(Record, OpNum, NextValueNo, Op) ||
OpNum != Record.size())
return Error("Invalid RET record");
I = new ReturnInst(Op);
break;
}
case bitc::FUNC_CODE_INST_BR: { // BR: [bb#, bb#, opval] or [bb#]
if (Record.size() != 1 && Record.size() != 3)

22
lib/Bitcode/Writer/BitcodeWriter.cpp
View File

@ -747,23 +747,15 @@ static void WriteInstruction(const Instruction &I, unsigned InstID,
case Instruction::GetResult:
Code = bitc::FUNC_CODE_INST_GETRESULT;
PushValueAndType(I.getOperand(0), InstID, Vals, VE);
Vals.push_back(cast<GetResultInst>(I).getIndex());
Vals.push_back(Log2_32(cast<GetResultInst>(I).getIndex())+1);
break;
case Instruction::Ret:
{
Code = bitc::FUNC_CODE_INST_RET;
unsigned NumOperands = I.getNumOperands();
if (NumOperands == 0)
AbbrevToUse = FUNCTION_INST_RET_VOID_ABBREV;
else if (NumOperands == 1) {
if (!PushValueAndType(I.getOperand(0), InstID, Vals, VE))
AbbrevToUse = FUNCTION_INST_RET_VAL_ABBREV;
} else {
for (unsigned i = 0, e = NumOperands; i != e; ++i)
PushValueAndType(I.getOperand(i), InstID, Vals, VE);
}
}
case Instruction::Ret:
Code = bitc::FUNC_CODE_INST_RET;
if (!I.getNumOperands())
AbbrevToUse = FUNCTION_INST_RET_VOID_ABBREV;
else if (!PushValueAndType(I.getOperand(0), InstID, Vals, VE))
AbbrevToUse = FUNCTION_INST_RET_VAL_ABBREV;
break;
case Instruction::Br:
Code = bitc::FUNC_CODE_INST_BR;

2
test/Assembler/2008-02-20-MultipleReturnValue.ll
View File

@ -1,4 +1,4 @@
; RUN: llvm-as < %s | opt -verify | llvm-dis | llvm-as -disable-output
; RUN: llvm-as < %s -disable-output
define {i32, i8} @foo(i32 %p) {
ret i32 1, i8 2