6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-02 22:30:36 +00:00
Code Issues Projects Releases Wiki Activity

Update bitcode reader and writer to handle multiple return values.

Browse Source 
Take 2.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47583 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel 2008-02-26 01:29:32 +00:00
parent aaeb60ae40
commit d9d99ff8e8
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -747,15 +747,24 @@ static void WriteInstruction(const Instruction &I, unsigned InstID,
case Instruction::GetResult: case Instruction::GetResult:
Code = bitc::FUNC_CODE_INST_GETRESULT; Code = bitc::FUNC_CODE_INST_GETRESULT;
PushValueAndType(I.getOperand(0), InstID, Vals, VE); PushValueAndType(I.getOperand(0), InstID, Vals, VE);
Vals.push_back(Log2_32(cast<GetResultInst>(I).getIndex())+1); Vals.push_back(cast<GetResultInst>(I).getIndex());
break; break;
case Instruction::Ret: case Instruction::Ret:
{
Code = bitc::FUNC_CODE_INST_RET; Code = bitc::FUNC_CODE_INST_RET;
if (!I.getNumOperands()) unsigned NumOperands = I.getNumOperands();
// printf ("dpatel write %d\n", NumOperands);
if (NumOperands == 0)
AbbrevToUse = FUNCTION_INST_RET_VOID_ABBREV; AbbrevToUse = FUNCTION_INST_RET_VOID_ABBREV;
else if (!PushValueAndType(I.getOperand(0), InstID, Vals, VE)) else if (NumOperands == 1) {
if (!PushValueAndType(I.getOperand(0), InstID, Vals, VE))
AbbrevToUse = FUNCTION_INST_RET_VAL_ABBREV; AbbrevToUse = FUNCTION_INST_RET_VAL_ABBREV;
} else {
for (unsigned i = 0, e = NumOperands; i != e; ++i)
PushValueAndType(I.getOperand(i), InstID, Vals, VE);
}
}
break; break;
case Instruction::Br: case Instruction::Br:
Code = bitc::FUNC_CODE_INST_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 -disable-output ; RUN: llvm-as < %s | opt -verify | llvm-dis | llvm-as -disable-output
define {i32, i8} @foo(i32 %p) { define {i32, i8} @foo(i32 %p) {
ret i32 1, i8 2 ret i32 1, i8 2