Rename method

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25571 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-01-24 04:14:29 +00:00
parent cc041ba03a
commit 6631601eed
7 changed files with 1168 additions and 1128 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -93,46 +93,47 @@ typedef union {
#define CALL 310
#define TAIL 311
#define ASM_TOK 312
#define CC_TOK 313
#define CCC_TOK 314
#define FASTCC_TOK 315
#define COLDCC_TOK 316
#define RET 317
#define BR 318
#define SWITCH 319
#define INVOKE 320
#define UNWIND 321
#define UNREACHABLE 322
#define ADD 323
#define SUB 324
#define MUL 325
#define DIV 326
#define REM 327
#define AND 328
#define OR 329
#define XOR 330
#define SETLE 331
#define SETGE 332
#define SETLT 333
#define SETGT 334
#define SETEQ 335
#define SETNE 336
#define MALLOC 337
#define ALLOCA 338
#define FREE 339
#define LOAD 340
#define STORE 341
#define GETELEMENTPTR 342
#define PHI_TOK 343
#define CAST 344
#define SELECT 345
#define SHL 346
#define SHR 347
#define VAARG 348
#define EXTRACTELEMENT 349
#define INSERTELEMENT 350
#define VAARG_old 351
#define VANEXT_old 352
#define MODULE 313
#define CC_TOK 314
#define CCC_TOK 315
#define FASTCC_TOK 316
#define COLDCC_TOK 317
#define RET 318
#define BR 319
#define SWITCH 320
#define INVOKE 321
#define UNWIND 322
#define UNREACHABLE 323
#define ADD 324
#define SUB 325
#define MUL 326
#define DIV 327
#define REM 328
#define AND 329
#define OR 330
#define XOR 331
#define SETLE 332
#define SETGE 333
#define SETLT 334
#define SETGT 335
#define SETEQ 336
#define SETNE 337
#define MALLOC 338
#define ALLOCA 339
#define FREE 340
#define LOAD 341
#define STORE 342
#define GETELEMENTPTR 343
#define PHI_TOK 344
#define CAST 345
#define SELECT 346
#define SHL 347
#define SHR 348
#define VAARG 349
#define EXTRACTELEMENT 350
#define INSERTELEMENT 351
#define VAARG_old 352
#define VANEXT_old 353
extern YYSTYPE llvmAsmlval;

View File

@ -1636,15 +1636,15 @@ ConstPool : ConstPool OptAssign TYPE TypesV {
AsmBlock : STRINGCONSTANT {
const std::string &AsmSoFar = CurModule.CurrentModule->getInlineAsm();
const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
char *EndStr = UnEscapeLexed($1, true);
std::string NewAsm($1, EndStr);
free($1);
if (AsmSoFar.empty())
CurModule.CurrentModule->setInlineAsm(NewAsm);
CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
else
CurModule.CurrentModule->setInlineAsm(AsmSoFar+"\n"+NewAsm);
CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
};
BigOrLittle : BIG { $$ = Module::BigEndian; };

View File

@ -2111,7 +2111,7 @@ void BytecodeReader::ParseModuleGlobalInfo() {
// If the file has module-level inline asm, read it now.
if (!hasAlignment && At != BlockEnd)
TheModule->setInlineAsm(read_str());
TheModule->setModuleInlineAsm(read_str());
}
// If any globals are in specified sections, assign them now.

View File

@ -1032,7 +1032,7 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
output(SectionNames[i]);
// Output the inline asm string.
output(M->getInlineAsm());
output(M->getModuleInlineAsm());
}
void BytecodeWriter::outputInstructions(const Function *F) {

View File

@ -833,11 +833,12 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
Dest->getTargetTriple() != Src->getTargetTriple())
std::cerr << "WARNING: Linking two modules of different target triples!\n";
if (!Src->getInlineAsm().empty()) {
if (Dest->getInlineAsm().empty())
Dest->setInlineAsm(Src->getInlineAsm());
if (!Src->getModuleInlineAsm().empty()) {
if (Dest->getModuleInlineAsm().empty())
Dest->setModuleInlineAsm(Src->getModuleInlineAsm());
else
Dest->setInlineAsm(Dest->getInlineAsm()+"\n"+Src->getInlineAsm());
Dest->setModuleInlineAsm(Dest->getModuleInlineAsm()+"\n"+
Src->getModuleInlineAsm());
}
// Update the destination module's dependent libraries list with the libraries