[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.l llvmAsmParser.y
Chris Lattner
lattner at cs.uiuc.edu
Sat Oct 18 00:54:17 PDT 2003
Changes in directory llvm/lib/AsmParser:
Lexer.l updated: 1.40 -> 1.41
llvmAsmParser.y updated: 1.133 -> 1.134
---
Log message:
New revised variable argument handling support
---
Diffs of the changes: (+108 -5)
Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.40 llvm/lib/AsmParser/Lexer.l:1.41
--- llvm/lib/AsmParser/Lexer.l:1.40 Fri Oct 10 14:12:08 2003
+++ llvm/lib/AsmParser/Lexer.l Sat Oct 18 00:53:13 2003
@@ -129,7 +129,7 @@
Label [-a-zA-Z$._0-9]+:
/* Quoted names can contain any character except " and \ */
-StringConstant \"[^\"]+\"
+StringConstant \"[^\"]*\"
/* [PN]Integer: match positive and negative literal integer values that
@@ -224,7 +224,9 @@
cast { RET_TOK(OtherOpVal, Cast, CAST); }
shl { RET_TOK(OtherOpVal, Shl, SHL); }
shr { RET_TOK(OtherOpVal, Shr, SHR); }
-va_arg { RET_TOK(OtherOpVal, VarArg, VA_ARG); }
+va_arg { return VA_ARG; /* FIXME: OBSOLETE */}
+vanext { RET_TOK(OtherOpVal, VANext, VANEXT); }
+vaarg { RET_TOK(OtherOpVal, VAArg , VAARG); }
ret { RET_TOK(TermOpVal, Ret, RET); }
br { RET_TOK(TermOpVal, Br, BR); }
Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.133 llvm/lib/AsmParser/llvmAsmParser.y:1.134
--- llvm/lib/AsmParser/llvmAsmParser.y:1.133 Fri Oct 17 00:11:44 2003
+++ llvm/lib/AsmParser/llvmAsmParser.y Sat Oct 18 00:53:13 2003
@@ -37,6 +37,14 @@
#define YYERROR_VERBOSE 1
+// HACK ALERT: This variable is used to implement the automatic conversion of
+// variable argument instructions from their old to new forms. When this
+// compatiblity "Feature" is removed, this should be too.
+//
+static BasicBlock *CurBB;
+static bool ObsoleteVarArgs;
+
+
// This contains info used when building the body of a function. It is
// destroyed when the function is completed.
//
@@ -595,11 +603,76 @@
llvmAsmin = F;
CurFilename = Filename;
llvmAsmlineno = 1; // Reset the current line number...
+ ObsoleteVarArgs = false;
// Allocate a new module to read
CurModule.CurrentModule = new Module(Filename);
yyparse(); // Parse the file.
+
Module *Result = ParserResult;
+
+ // Check to see if they called va_start but not va_arg..
+ if (!ObsoleteVarArgs)
+ if (Function *F = Result->getNamedFunction("llvm.va_start"))
+ if (F->asize() == 1) {
+ std::cerr << "WARNING: this file uses obsolete features. "
+ << "Assemble and disassemble to update it.\n";
+ ObsoleteVarArgs = true;
+ }
+
+
+ if (ObsoleteVarArgs) {
+ // If the user is making use of obsolete varargs intrinsics, adjust them for
+ // the user.
+ if (Function *F = Result->getNamedFunction("llvm.va_start")) {
+ assert(F->asize() == 1 && "Obsolete va_start takes 1 argument!");
+
+ const Type *RetTy = F->getFunctionType()->getParamType(0);
+ RetTy = cast<PointerType>(RetTy)->getElementType();
+ Function *NF = Result->getOrInsertFunction("llvm.va_start", RetTy, 0);
+
+ while (!F->use_empty()) {
+ CallInst *CI = cast<CallInst>(F->use_back());
+ Value *V = new CallInst(NF, "", CI);
+ new StoreInst(V, CI->getOperand(1), CI);
+ CI->getParent()->getInstList().erase(CI);
+ }
+ Result->getFunctionList().erase(F);
+ }
+
+ if (Function *F = Result->getNamedFunction("llvm.va_end")) {
+ assert(F->asize() == 1 && "Obsolete va_end takes 1 argument!");
+ const Type *ArgTy = F->getFunctionType()->getParamType(0);
+ ArgTy = cast<PointerType>(ArgTy)->getElementType();
+ Function *NF = Result->getOrInsertFunction("llvm.va_end", Type::VoidTy,
+ ArgTy, 0);
+
+ while (!F->use_empty()) {
+ CallInst *CI = cast<CallInst>(F->use_back());
+ Value *V = new LoadInst(CI->getOperand(1), "", CI);
+ new CallInst(NF, V, "", CI);
+ CI->getParent()->getInstList().erase(CI);
+ }
+ Result->getFunctionList().erase(F);
+ }
+
+ if (Function *F = Result->getNamedFunction("llvm.va_copy")) {
+ assert(F->asize() == 2 && "Obsolete va_copy takes 2 argument!");
+ const Type *ArgTy = F->getFunctionType()->getParamType(0);
+ ArgTy = cast<PointerType>(ArgTy)->getElementType();
+ Function *NF = Result->getOrInsertFunction("llvm.va_copy", ArgTy,
+ ArgTy, 0);
+
+ while (!F->use_empty()) {
+ CallInst *CI = cast<CallInst>(F->use_back());
+ Value *V = new CallInst(NF, CI->getOperand(2), "", CI);
+ new StoreInst(V, CI->getOperand(1), CI);
+ CI->getParent()->getInstList().erase(CI);
+ }
+ Result->getFunctionList().erase(F);
+ }
+ }
+
llvmAsmin = stdin; // F is about to go away, don't use it anymore...
ParserResult = 0;
@@ -712,7 +785,8 @@
// Other Operators
%type <OtherOpVal> ShiftOps
-%token <OtherOpVal> PHI CALL CAST SHL SHR VA_ARG
+%token <OtherOpVal> PHI CALL CAST SHL SHR VAARG VANEXT
+%token VA_ARG // FIXME: OBSOLETE
%start Module
%%
@@ -1452,7 +1526,7 @@
$$ = $1;
}
| /* empty */ {
- $$ = new BasicBlock();
+ $$ = CurBB = new BasicBlock();
};
BBTerminatorInst : RET ResolvedVal { // Return with a result...
@@ -1643,7 +1717,34 @@
delete $4;
}
| VA_ARG ResolvedVal ',' Types {
- $$ = new VarArgInst($2, *$4);
+ // FIXME: This is emulation code for an obsolete syntax. This should be
+ // removed at some point.
+ if (!ObsoleteVarArgs) {
+ std::cerr << "WARNING: this file uses obsolete features. "
+ << "Assemble and disassemble to update it.\n";
+ ObsoleteVarArgs = true;
+ }
+
+ // First, load the valist...
+ Instruction *CurVAList = new LoadInst($2, "");
+ CurBB->getInstList().push_back(CurVAList);
+
+ // Emit the vaarg instruction.
+ $$ = new VAArgInst(CurVAList, *$4);
+
+ // Now we must advance the pointer and update it in memory.
+ Instruction *TheVANext = new VANextInst(CurVAList, *$4);
+ CurBB->getInstList().push_back(TheVANext);
+
+ CurBB->getInstList().push_back(new StoreInst(TheVANext, $2));
+ delete $4;
+ }
+ | VAARG ResolvedVal ',' Types {
+ $$ = new VAArgInst($2, *$4);
+ delete $4;
+ }
+ | VANEXT ResolvedVal ',' Types {
+ $$ = new VANextInst($2, *$4);
delete $4;
}
| PHI PHIList {
More information about the llvm-commits
mailing list