mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-18 12:29:21 +00:00
Fix problem with a cast instruction that must be expanded to type 0
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@929 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
2827d52868
commit
5ab1f87786
@ -48,6 +48,7 @@ bool BytecodeParser::ParseRawInst(const uchar *&Buf, const uchar *EndBuf,
|
||||
if (read_vbr(Buf, EndBuf, Result.Opcode)) return failure(true);
|
||||
if (read_vbr(Buf, EndBuf, Typ)) return failure(true);
|
||||
Result.Ty = getType(Typ);
|
||||
if (Result.Ty == 0) return failure(true);
|
||||
if (read_vbr(Buf, EndBuf, Result.NumOperands)) return failure(true);
|
||||
|
||||
switch (Result.NumOperands) {
|
||||
@ -109,10 +110,13 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf,
|
||||
|
||||
Value *V;
|
||||
switch (Raw.Opcode) {
|
||||
case Instruction::Cast:
|
||||
Res = new CastInst(getValue(Raw.Ty, Raw.Arg1), getType(Raw.Arg2));
|
||||
case Instruction::Cast: {
|
||||
V = getValue(Raw.Ty, Raw.Arg1);
|
||||
const Type *Ty = getType(Raw.Arg2);
|
||||
if (V == 0 || Ty == 0) { cerr << "Invalid cast!\n"; return true; }
|
||||
Res = new CastInst(V, Ty);
|
||||
return false;
|
||||
|
||||
}
|
||||
case Instruction::PHINode: {
|
||||
PHINode *PN = new PHINode(Raw.Ty);
|
||||
switch (Raw.NumOperands) {
|
||||
|
@ -34,13 +34,20 @@ static void outputInstructionFormat0(const Instruction *I,
|
||||
output_vbr(Type, Out); // Result type
|
||||
|
||||
unsigned NumArgs = I->getNumOperands();
|
||||
output_vbr(NumArgs, Out);
|
||||
output_vbr(NumArgs + isa<CastInst>(I), Out);
|
||||
|
||||
for (unsigned i = 0; i < NumArgs; ++i) {
|
||||
int Slot = Table.getValSlot(I->getOperand(i));
|
||||
assert(Slot >= 0 && "No slot number for value!?!?");
|
||||
output_vbr((unsigned)Slot, Out);
|
||||
}
|
||||
|
||||
if (isa<CastInst>(I)) {
|
||||
int Slot = Table.getValSlot(I->getType());
|
||||
assert(Slot != -1 && "Cast return type unknown?");
|
||||
output_vbr((unsigned)Slot, Out);
|
||||
}
|
||||
|
||||
align32(Out); // We must maintain correct alignment!
|
||||
}
|
||||
|
||||
@ -210,7 +217,7 @@ void BytecodeWriter::processInstruction(const Instruction *I) {
|
||||
if (Slot > MaxOpSlot) MaxOpSlot = Slot;
|
||||
|
||||
// Handle the special case for cast...
|
||||
if (I->getOpcode() == Instruction::Cast) {
|
||||
if (isa<CastInst>(I)) {
|
||||
// Cast has to encode the destination type as the second argument in the
|
||||
// packet, or else we won't know what type to cast to!
|
||||
Slots[1] = Table.getValSlot(I->getType());
|
||||
|
Loading…
Reference in New Issue
Block a user