mirror of
https://github.com/RPCSX/llvm.git
synced 2025-02-07 13:09:52 +00:00
Rename method
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25571 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
cc041ba03a
commit
6631601eed
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -93,46 +93,47 @@ typedef union {
|
|||||||
#define CALL 310
|
#define CALL 310
|
||||||
#define TAIL 311
|
#define TAIL 311
|
||||||
#define ASM_TOK 312
|
#define ASM_TOK 312
|
||||||
#define CC_TOK 313
|
#define MODULE 313
|
||||||
#define CCC_TOK 314
|
#define CC_TOK 314
|
||||||
#define FASTCC_TOK 315
|
#define CCC_TOK 315
|
||||||
#define COLDCC_TOK 316
|
#define FASTCC_TOK 316
|
||||||
#define RET 317
|
#define COLDCC_TOK 317
|
||||||
#define BR 318
|
#define RET 318
|
||||||
#define SWITCH 319
|
#define BR 319
|
||||||
#define INVOKE 320
|
#define SWITCH 320
|
||||||
#define UNWIND 321
|
#define INVOKE 321
|
||||||
#define UNREACHABLE 322
|
#define UNWIND 322
|
||||||
#define ADD 323
|
#define UNREACHABLE 323
|
||||||
#define SUB 324
|
#define ADD 324
|
||||||
#define MUL 325
|
#define SUB 325
|
||||||
#define DIV 326
|
#define MUL 326
|
||||||
#define REM 327
|
#define DIV 327
|
||||||
#define AND 328
|
#define REM 328
|
||||||
#define OR 329
|
#define AND 329
|
||||||
#define XOR 330
|
#define OR 330
|
||||||
#define SETLE 331
|
#define XOR 331
|
||||||
#define SETGE 332
|
#define SETLE 332
|
||||||
#define SETLT 333
|
#define SETGE 333
|
||||||
#define SETGT 334
|
#define SETLT 334
|
||||||
#define SETEQ 335
|
#define SETGT 335
|
||||||
#define SETNE 336
|
#define SETEQ 336
|
||||||
#define MALLOC 337
|
#define SETNE 337
|
||||||
#define ALLOCA 338
|
#define MALLOC 338
|
||||||
#define FREE 339
|
#define ALLOCA 339
|
||||||
#define LOAD 340
|
#define FREE 340
|
||||||
#define STORE 341
|
#define LOAD 341
|
||||||
#define GETELEMENTPTR 342
|
#define STORE 342
|
||||||
#define PHI_TOK 343
|
#define GETELEMENTPTR 343
|
||||||
#define CAST 344
|
#define PHI_TOK 344
|
||||||
#define SELECT 345
|
#define CAST 345
|
||||||
#define SHL 346
|
#define SELECT 346
|
||||||
#define SHR 347
|
#define SHL 347
|
||||||
#define VAARG 348
|
#define SHR 348
|
||||||
#define EXTRACTELEMENT 349
|
#define VAARG 349
|
||||||
#define INSERTELEMENT 350
|
#define EXTRACTELEMENT 350
|
||||||
#define VAARG_old 351
|
#define INSERTELEMENT 351
|
||||||
#define VANEXT_old 352
|
#define VAARG_old 352
|
||||||
|
#define VANEXT_old 353
|
||||||
|
|
||||||
|
|
||||||
extern YYSTYPE llvmAsmlval;
|
extern YYSTYPE llvmAsmlval;
|
||||||
|
@ -1636,15 +1636,15 @@ ConstPool : ConstPool OptAssign TYPE TypesV {
|
|||||||
|
|
||||||
|
|
||||||
AsmBlock : STRINGCONSTANT {
|
AsmBlock : STRINGCONSTANT {
|
||||||
const std::string &AsmSoFar = CurModule.CurrentModule->getInlineAsm();
|
const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
|
||||||
char *EndStr = UnEscapeLexed($1, true);
|
char *EndStr = UnEscapeLexed($1, true);
|
||||||
std::string NewAsm($1, EndStr);
|
std::string NewAsm($1, EndStr);
|
||||||
free($1);
|
free($1);
|
||||||
|
|
||||||
if (AsmSoFar.empty())
|
if (AsmSoFar.empty())
|
||||||
CurModule.CurrentModule->setInlineAsm(NewAsm);
|
CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
|
||||||
else
|
else
|
||||||
CurModule.CurrentModule->setInlineAsm(AsmSoFar+"\n"+NewAsm);
|
CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
|
||||||
};
|
};
|
||||||
|
|
||||||
BigOrLittle : BIG { $$ = Module::BigEndian; };
|
BigOrLittle : BIG { $$ = Module::BigEndian; };
|
||||||
|
@ -2111,7 +2111,7 @@ void BytecodeReader::ParseModuleGlobalInfo() {
|
|||||||
|
|
||||||
// If the file has module-level inline asm, read it now.
|
// If the file has module-level inline asm, read it now.
|
||||||
if (!hasAlignment && At != BlockEnd)
|
if (!hasAlignment && At != BlockEnd)
|
||||||
TheModule->setInlineAsm(read_str());
|
TheModule->setModuleInlineAsm(read_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// If any globals are in specified sections, assign them now.
|
// If any globals are in specified sections, assign them now.
|
||||||
|
@ -1032,7 +1032,7 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
|
|||||||
output(SectionNames[i]);
|
output(SectionNames[i]);
|
||||||
|
|
||||||
// Output the inline asm string.
|
// Output the inline asm string.
|
||||||
output(M->getInlineAsm());
|
output(M->getModuleInlineAsm());
|
||||||
}
|
}
|
||||||
|
|
||||||
void BytecodeWriter::outputInstructions(const Function *F) {
|
void BytecodeWriter::outputInstructions(const Function *F) {
|
||||||
|
@ -833,11 +833,12 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
|
|||||||
Dest->getTargetTriple() != Src->getTargetTriple())
|
Dest->getTargetTriple() != Src->getTargetTriple())
|
||||||
std::cerr << "WARNING: Linking two modules of different target triples!\n";
|
std::cerr << "WARNING: Linking two modules of different target triples!\n";
|
||||||
|
|
||||||
if (!Src->getInlineAsm().empty()) {
|
if (!Src->getModuleInlineAsm().empty()) {
|
||||||
if (Dest->getInlineAsm().empty())
|
if (Dest->getModuleInlineAsm().empty())
|
||||||
Dest->setInlineAsm(Src->getInlineAsm());
|
Dest->setModuleInlineAsm(Src->getModuleInlineAsm());
|
||||||
else
|
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
|
// Update the destination module's dependent libraries list with the libraries
|
||||||
|
Loading…
x
Reference in New Issue
Block a user