From c8b25d40cbec063b1ca99cc1adf794399c6d05c0 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 7 Jul 2001 08:36:50 +0000 Subject: Changed the fundemental architecture of Operands for Instructions. Now Operands are maintained as a vector in the User class, and operator iterators are provided as before. Getting an operand no longer requires a virtual function call. WARNING: getOperand(x) where x >= getNumOperands() will now assert instead of returning null! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Bytecode/Reader/InstructionReader.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'lib/Bytecode/Reader/InstructionReader.cpp') diff --git a/lib/Bytecode/Reader/InstructionReader.cpp b/lib/Bytecode/Reader/InstructionReader.cpp index fd919c92a2..dac7d37415 100644 --- a/lib/Bytecode/Reader/InstructionReader.cpp +++ b/lib/Bytecode/Reader/InstructionReader.cpp @@ -80,8 +80,11 @@ bool BytecodeParser::ParseRawInst(const uchar *&Buf, const uchar *EndBuf, break; } - //cerr << "NO: " << Result.NumOperands << " opcode: " << Result.Opcode - // << " Ty: " << Result.Ty->getName() << " arg1: " << Result.Arg1 << endl; +#if 0 + cerr << "NO: " << Result.NumOperands << " opcode: " << Result.Opcode + << " Ty: " << Result.Ty->getName() << " arg1: " << Result.Arg1 + << " arg2: " << Result.Arg2 << " arg3: " << Result.Arg3 << endl; +#endif return false; } @@ -198,13 +201,13 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf, return false; } else if (Raw.Opcode == Instruction::Malloc) { if (Raw.NumOperands > 2) return true; - Value *Sz = (Raw.NumOperands == 2) ? getValue(Type::UIntTy, Raw.Arg2) : 0; - Res = new MallocInst((ConstPoolType*)getValue(Type::TypeTy, Raw.Arg1), Sz); + Value *Sz = Raw.NumOperands ? getValue(Type::UIntTy, Raw.Arg1) : 0; + Res = new MallocInst(Raw.Ty, Sz); return false; } else if (Raw.Opcode == Instruction::Alloca) { if (Raw.NumOperands > 2) return true; - Value *Sz = (Raw.NumOperands == 2) ? getValue(Type::UIntTy, Raw.Arg2) : 0; - Res = new AllocaInst((ConstPoolType*)getValue(Type::TypeTy, Raw.Arg1), Sz); + Value *Sz = Raw.NumOperands ? getValue(Type::UIntTy, Raw.Arg1) : 0; + Res = new AllocaInst(Raw.Ty, Sz); return false; } else if (Raw.Opcode == Instruction::Free) { Value *Val = getValue(Raw.Ty, Raw.Arg1); @@ -213,6 +216,7 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf, return false; } - cerr << "Unrecognized instruction! " << Raw.Opcode << endl; + cerr << "Unrecognized instruction! " << Raw.Opcode + << " ADDR = 0x" << (void*)Buf << endl; return true; } -- cgit v1.2.3-18-g5258