The LLVM Lexicon

Name	Value Type	Description	Default
LANG ITEMS
lang.name	string	Provides the common name for a language definition. + For example "C++", "Pascal", "FORTRAN", etc.	blank
lang.opt1	string	Specifies the parameters to give the optimizer when `-O1` is + specified on the `llvmc` command line.	`-simplifycfg -instcombine -mem2reg`
lang.opt2	string	Specifies the parameters to give the optimizer when `-O2` is + specified on the `llvmc` command line.	TBD
lang.opt3	string	Specifies the parameters to give the optimizer when `-O3` is + specified on the `llvmc` command line.	TBD
lang.opt4	string	Specifies the parameters to give the optimizer when `-O4` is + specified on the `llvmc` command line.	TBD
lang.opt5	string	Specifies the parameters to give the optimizer when `-O5` is + specified on the `llvmc` command line.	TBD
PREPROCESSOR ITEMS
preprocessor.command	command	This provides the command prototype that will be used + to run the preprocessor. Valid substitutions are `@in@` for the + input file and `@out@` for the output file. This is generally only + used with the `-E` option.	<blank>
Capabilities.hasPreProcessor	preprocessor.required	boolean	This item specifies whether the language has a - pre-processing phase or not. This controls whether the B<-E> option works - for the language or not.	This item specifies whether the pre-processing phase + is required by the language. If the value is true, then the + `preprocessor.command` value must not be blank. With this option, + `llvmc` will always run the preprocessor as it assumes that the + translation and optimization phases don't know how to pre-process their + input.	false
TRANSLATOR ITEMS
Capabilities.outputFormat	"bc" or "ll"	translator.command	command	This provides the command prototype that will be used + to run the translator. Valid substitutions are `@in@` for the + input file and `@out@` for the output file.	<blank>
translator.output	`native`, `bytecode` or `assembly`	This item specifies the kind of output the language's - compiler generates. The choices are either bytecode (`bc`) or LLVM - assembly (`ll`).	`bytecode`
translator.preprocesses	boolean	Indicates that the translator also preprocesses. If this is true, then + `llvmc` will skip the pre-processing phase whenever the final + phase is not pre-processing.	`false`
translator.optimizers	boolean	Indicates that the translator also optimizes. If this is true, then + `llvmc` will skip the optimization phase whenever the final phase + is optimization or later.	`false`
Capabilities.understandsOptimization	translator.groks_dash_o	boolean	Indicates whether the compiler for this language understands the - `-O` options or not	Indicates that the translator understands the intent of the + various `-O`n options to `llvmc`. This will cause the + `-O`n option to be based to the translator instead of the + equivalent options provided by `lang.opt`n.	`false`
OPTIMIZER ITEMS
ASSEMBLER ITEMS
LINKER ITEMS

Name

Value Type

Description

Default

LANG ITEMS

lang.name

string

Provides the common name for a language definition. + For example "C++", "Pascal", "FORTRAN", etc.

blank

lang.opt1

string

Specifies the parameters to give the optimizer when -O1 is + specified on the llvmc command line.

-simplifycfg -instcombine -mem2reg

lang.opt2

string

Specifies the parameters to give the optimizer when -O2 is + specified on the llvmc command line.

TBD

lang.opt3

string

Specifies the parameters to give the optimizer when -O3 is + specified on the llvmc command line.

TBD

lang.opt4

string

Specifies the parameters to give the optimizer when -O4 is + specified on the llvmc command line.

TBD

lang.opt5

string

Specifies the parameters to give the optimizer when -O5 is + specified on the llvmc command line.

TBD

PREPROCESSOR ITEMS

preprocessor.command

command

This provides the command prototype that will be used + to run the preprocessor. Valid substitutions are @in@ for the + input file and @out@ for the output file. This is generally only + used with the -E option.

<blank>

Capabilities.hasPreProcessor

preprocessor.required

boolean

This item specifies whether the language has a - pre-processing phase or not. This controls whether the B<-E> option works - for the language or not.

This item specifies whether the pre-processing phase + is required by the language. If the value is true, then the + preprocessor.command value must not be blank. With this option, + llvmc will always run the preprocessor as it assumes that the + translation and optimization phases don't know how to pre-process their + input.

false

TRANSLATOR ITEMS

Capabilities.outputFormat

"bc" or "ll"

translator.command

command

This provides the command prototype that will be used + to run the translator. Valid substitutions are @in@ for the + input file and @out@ for the output file.

<blank>

translator.output

native, bytecode or assembly

This item specifies the kind of output the language's - compiler generates. The choices are either bytecode (bc) or LLVM - assembly (ll).

bytecode

translator.preprocesses

boolean

Indicates that the translator also preprocesses. If this is true, then + llvmc will skip the pre-processing phase whenever the final + phase is not pre-processing.

false

translator.optimizers

boolean

Indicates that the translator also optimizes. If this is true, then + llvmc will skip the optimization phase whenever the final phase + is optimization or later.

false

Capabilities.understandsOptimization

translator.groks_dash_o

boolean

Indicates whether the compiler for this language understands the - -O options or not

Indicates that the translator understands the intent of the + various -On options to llvmc. This will cause the + -On option to be based to the translator instead of the + equivalent options provided by lang.optn.

false

OPTIMIZER ITEMS

ASSEMBLER ITEMS

LINKER ITEMS

If you have questions about the LLVM code generated by the @@ -210,7 +210,8 @@ sub sanitychecktools { my $sanitycheckfail = ''; - barf("The demo page is currently down due to high load, please try again later!"); + barf("The demo page is currently down due to high load, please try again later!") + if ($DisableLoad); # insert tool-specific sanity checks here $sanitycheckfail .= ' gccas' if `gccas --help 2>&1` !~ /assembler for GCC/; From lattner at cs.uiuc.edu Tue Aug 17 11:26:50 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 11:26:50 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/AsmPrinter.h Message-ID: <200408171626.LAA16062@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/CodeGen: AsmPrinter.h updated: 1.5 -> 1.6 --- Log message: Allow targets to specify a comment character --- Diffs of the changes: (+6 -1) Index: llvm/include/llvm/CodeGen/AsmPrinter.h diff -u llvm/include/llvm/CodeGen/AsmPrinter.h:1.5 llvm/include/llvm/CodeGen/AsmPrinter.h:1.6 --- llvm/include/llvm/CodeGen/AsmPrinter.h:1.5 Tue Aug 17 01:48:34 2004 +++ llvm/include/llvm/CodeGen/AsmPrinter.h Tue Aug 17 11:26:36 2004 @@ -45,9 +45,13 @@ // Properties to be set by the derived class ctor, used to configure the // asmwriter. + /// CommentChar - This indicates the comment character used by the + /// assembler. + const char *CommentChar; + /// GlobalPrefix - If this is set to a non-empty string, it is prepended /// onto all global symbols. This is often used for "_" or ".". - const char *GlobalPrefix; + const char *GlobalPrefix; // Defaults to "" /// ZeroDirective - this should be set to the directive used to get some /// number of zero bytes emitted to the current section. Common cases are @@ -69,6 +73,7 @@ AsmPrinter(std::ostream &o, TargetMachine &tm) : O(o), TM(tm), + CommentChar("#"), GlobalPrefix(""), ZeroDirective("\t.zero\t"), AsciiDirective("\t.ascii\t"), From lattner at cs.uiuc.edu Tue Aug 17 11:27:16 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 11:27:16 -0500 Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp Message-ID: <200408171627.LAA16073@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CodeGen: AsmPrinter.cpp updated: 1.5 -> 1.6 --- Log message: Use a designated comment character when printing comments. --- Diffs of the changes: (+18 -9) Index: llvm/lib/CodeGen/AsmPrinter.cpp diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.5 llvm/lib/CodeGen/AsmPrinter.cpp:1.6 --- llvm/lib/CodeGen/AsmPrinter.cpp:1.5 Tue Aug 17 01:48:16 2004 +++ llvm/lib/CodeGen/AsmPrinter.cpp Tue Aug 17 11:27:05 2004 @@ -204,14 +204,18 @@ O << Data64bitsDirective << U.UVal << "\n"; else if (TD.isBigEndian()) { O << Data32bitsDirective << unsigned(U.UVal >> 32) - << "\t; double most significant word " << Val << "\n"; + << "\t" << CommentChar << " double most significant word " + << Val << "\n"; O << Data32bitsDirective << unsigned(U.UVal) - << "\t; double least significant word " << Val << "\n"; + << "\t" << CommentChar << " double least significant word " + << Val << "\n"; } else { O << Data32bitsDirective << unsigned(U.UVal) - << "\t; double least significant word " << Val << "\n"; + << "\t" << CommentChar << " double least significant word " << Val + << "\n"; O << Data32bitsDirective << unsigned(U.UVal >> 32) - << "\t; double most significant word " << Val << "\n"; + << "\t" << CommentChar << " double most significant word " << Val + << "\n"; } return; } else { @@ -221,7 +225,8 @@ } U; U.FVal = Val; - O << Data32bitsDirective << U.UVal << "\t; float " << Val << "\n"; + O << Data32bitsDirective << U.UVal << "\t" << CommentChar + << " float " << Val << "\n"; return; } } else if (CV->getType() == Type::ULongTy || CV->getType() == Type::LongTy) { @@ -232,14 +237,18 @@ O << Data64bitsDirective << Val << "\n"; else if (TD.isBigEndian()) { O << Data32bitsDirective << unsigned(Val >> 32) - << "\t; Double-word most significant word " << Val << "\n"; + << "\t" << CommentChar << " Double-word most significant word " + << Val << "\n"; O << Data32bitsDirective << unsigned(Val) - << "\t; Double-word least significant word " << Val << "\n"; + << "\t" << CommentChar << " Double-word least significant word " + << Val << "\n"; } else { O << Data32bitsDirective << unsigned(Val) - << "\t; Double-word least significant word " << Val << "\n"; + << "\t" << CommentChar << " Double-word least significant word " + << Val << "\n"; O << Data32bitsDirective << unsigned(Val >> 32) - << "\t; Double-word most significant word " << Val << "\n"; + << "\t" << CommentChar << " Double-word most significant word " + << Val << "\n"; } return; } From lattner at cs.uiuc.edu Tue Aug 17 11:27:37 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 11:27:37 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp Message-ID: <200408171627.LAA16086@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/PowerPC: PPC32AsmPrinter.cpp updated: 1.49 -> 1.50 --- Log message: Print comments with ; --- Diffs of the changes: (+1 -0) Index: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp diff -u llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.49 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.50 --- llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.49 Tue Aug 17 01:37:12 2004 +++ llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp Tue Aug 17 11:27:26 2004 @@ -45,6 +45,7 @@ PPC32AsmPrinter(std::ostream &O, TargetMachine &TM) : AsmPrinter(O, TM), LabelNumber(0) { + CommentChar = ";"; GlobalPrefix = "_"; ZeroDirective = "\t.space\t"; // ".space N" emits N zeros. Data64bitsDirective = 0; // we can't emit a 64-bit unit From brukman at cs.uiuc.edu Tue Aug 17 11:59:39 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 17 Aug 2004 11:59:39 -0500 Subject: [llvm-commits] CVS: llvm-www/ProjectsWithLLVM/index.html Message-ID: <200408171659.LAA10804@zion.cs.uiuc.edu> Changes in directory llvm-www/ProjectsWithLLVM: index.html updated: 1.15 -> 1.16 --- Log message: * Add table of contents * Wrap long lines * Standardize section/subsection headers --- Diffs of the changes: (+50 -21) Index: llvm-www/ProjectsWithLLVM/index.html diff -u llvm-www/ProjectsWithLLVM/index.html:1.15 llvm-www/ProjectsWithLLVM/index.html:1.16 --- llvm-www/ProjectsWithLLVM/index.html:1.15 Sat Jul 17 18:16:54 2004 +++ llvm-www/ProjectsWithLLVM/index.html Tue Aug 17 11:59:28 2004 @@ -4,9 +4,9 @@

From lattner at cs.uiuc.edu Tue Aug 17 12:26:53 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 12:26:53 -0500 Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y Message-ID: <200408171726.MAA23608@apoc.cs.uiuc.edu> Changes in directory llvm/lib/AsmParser: llvmAsmParser.y updated: 1.196 -> 1.197 --- Log message: Work around PR424: http://llvm.cs.uiuc.edu/PR424 for old c/c++ frontends. --- Diffs of the changes: (+29 -3) Index: llvm/lib/AsmParser/llvmAsmParser.y diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.196 llvm/lib/AsmParser/llvmAsmParser.y:1.197 --- llvm/lib/AsmParser/llvmAsmParser.y:1.196 Thu Jul 29 07:17:34 2004 +++ llvm/lib/AsmParser/llvmAsmParser.y Tue Aug 17 12:26:41 2004 @@ -916,7 +916,6 @@ %token RET BR SWITCH INVOKE UNWIND // Binary Operators -%type BinaryOps // all the binary operators %type ArithmeticOps LogicalOps SetCondOps // Binops Subcatagories %token ADD SUB MUL DIV REM AND OR XOR %token SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comarators @@ -955,7 +954,6 @@ ArithmeticOps: ADD | SUB | MUL | DIV | REM; LogicalOps : AND | OR | XOR; SetCondOps : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE; -BinaryOps : ArithmeticOps | LogicalOps | SetCondOps; ShiftOps : SHL | SHR; @@ -1326,9 +1324,37 @@ ThrowException("Select operand types must match!"); $$ = ConstantExpr::getSelect($3, $5, $7); } - | BinaryOps '(' ConstVal ',' ConstVal ')' { + | ArithmeticOps '(' ConstVal ',' ConstVal ')' { if ($3->getType() != $5->getType()) ThrowException("Binary operator types must match!"); + // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs. + // To retain backward compatibility with these early compilers, we emit a + // cast to the appropriate integer type automatically if we are in the + // broken case. See PR424 for more information. + if (!isa($3->getType())) { + $$ = ConstantExpr::get($1, $3, $5); + } else { + const Type *IntPtrTy; + switch (CurModule.CurrentModule->getPointerSize()) { + case Module::Pointer32: IntPtrTy = Type::IntTy; break; + case Module::Pointer64: IntPtrTy = Type::LongTy; break; + default: ThrowException("invalid pointer binary constant expr!"); + } + $$ = ConstantExpr::get($1, ConstantExpr::getCast($3, IntPtrTy), + ConstantExpr::getCast($5, IntPtrTy)); + $$ = ConstantExpr::getCast($$, $3->getType()); + } + } + | LogicalOps '(' ConstVal ',' ConstVal ')' { + if ($3->getType() != $5->getType()) + ThrowException("Logical operator types must match!"); + if (!$3->getType()->isIntegral()) + ThrowException("Logical operands must have integral types!"); + $$ = ConstantExpr::get($1, $3, $5); + } + | SetCondOps '(' ConstVal ',' ConstVal ')' { + if ($3->getType() != $5->getType()) + ThrowException("setcc operand types must match!"); $$ = ConstantExpr::get($1, $3, $5); } | ShiftOps '(' ConstVal ',' ConstVal ')' { From lattner at cs.uiuc.edu Tue Aug 17 12:28:58 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 12:28:58 -0500 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp Message-ID: <200408171728.MAA24591@apoc.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Constants.cpp updated: 1.101 -> 1.102 --- Log message: Check constant expression validity more strictly --- Diffs of the changes: (+31 -0) Index: llvm/lib/VMCore/Constants.cpp diff -u llvm/lib/VMCore/Constants.cpp:1.101 llvm/lib/VMCore/Constants.cpp:1.102 --- llvm/lib/VMCore/Constants.cpp:1.101 Wed Aug 4 17:26:13 2004 +++ llvm/lib/VMCore/Constants.cpp Tue Aug 17 12:28:46 2004 @@ -1127,6 +1127,37 @@ } Constant *ConstantExpr::get(unsigned Opcode, Constant *C1, Constant *C2) { +#ifndef NDEBUG + switch (Opcode) { + case Instruction::Add: case Instruction::Sub: + case Instruction::Mul: case Instruction::Div: + case Instruction::Rem: + assert(C1->getType() == C2->getType() && "Op types should be identical!"); + assert((C1->getType()->isInteger() || C1->getType()->isFloatingPoint()) && + "Tried to create an arithmetic operation on a non-arithmetic type!"); + break; + case Instruction::And: + case Instruction::Or: + case Instruction::Xor: + assert(C1->getType() == C2->getType() && "Op types should be identical!"); + assert(C1->getType()->isIntegral() && + "Tried to create an logical operation on a non-integral type!"); + break; + case Instruction::SetLT: case Instruction::SetGT: case Instruction::SetLE: + case Instruction::SetGE: case Instruction::SetEQ: case Instruction::SetNE: + assert(C1->getType() == C2->getType() && "Op types should be identical!"); + break; + case Instruction::Shl: + case Instruction::Shr: + assert(C2->getType() == Type::UByteTy && "Shift should be by ubyte!"); + assert(C1->getType()->isInteger() && + "Tried to create a shift operation on a non-integer type!"); + break; + default: + break; + } +#endif + if (Instruction::isRelational(Opcode)) return getTy(Type::BoolTy, Opcode, C1, C2); else From brukman at cs.uiuc.edu Tue Aug 17 12:52:46 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 17 Aug 2004 12:52:46 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineFunction.h Message-ID: <200408171752.MAA03254@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/CodeGen: MachineFunction.h updated: 1.39 -> 1.40 --- Log message: Ultra-doxygenify some function header comments. --- Diffs of the changes: (+3 -0) Index: llvm/include/llvm/CodeGen/MachineFunction.h diff -u llvm/include/llvm/CodeGen/MachineFunction.h:1.39 llvm/include/llvm/CodeGen/MachineFunction.h:1.40 --- llvm/include/llvm/CodeGen/MachineFunction.h:1.39 Mon Aug 16 17:35:26 2004 +++ llvm/include/llvm/CodeGen/MachineFunction.h Tue Aug 17 12:52:36 2004 @@ -48,6 +48,7 @@ static void setNext(MachineBasicBlock* N, MachineBasicBlock* next) { N->Next = next; } + static MachineBasicBlock* createNode(); void addNodeToList(MachineBasicBlock* N); void removeNodeFromList(MachineBasicBlock* N); @@ -117,6 +118,7 @@ /// getConstantPool - Return the constant pool object for the current /// function. + /// MachineConstantPool *getConstantPool() const { return ConstantPool; } /// MachineFunctionInfo - Keep track of various per-function pieces of @@ -128,6 +130,7 @@ /// are inserted into the machine function. The block number for a machine /// basic block can be found by using the MBB::getBlockNumber method, this /// method provides the inverse mapping. + /// MachineBasicBlock *getBlockNumbered(unsigned N) { assert(N < MBBNumbering.size() && "Illegal block number"); assert(MBBNumbering[N] && "Block was removed from the machine function!"); From brukman at cs.uiuc.edu Tue Aug 17 13:09:02 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 17 Aug 2004 13:09:02 -0500 Subject: [llvm-commits] CVS: llvm/include/Support/StringExtras.h Message-ID: <200408171809.NAA08741@zion.cs.uiuc.edu> Changes in directory llvm/include/Support: StringExtras.h updated: 1.20 -> 1.21 --- Log message: Add itostr(long) for our furry 64-bit friends. --- Diffs of the changes: (+7 -0) Index: llvm/include/Support/StringExtras.h diff -u llvm/include/Support/StringExtras.h:1.20 llvm/include/Support/StringExtras.h:1.21 --- llvm/include/Support/StringExtras.h:1.20 Tue Jul 20 11:14:06 2004 +++ llvm/include/Support/StringExtras.h Tue Aug 17 13:08:52 2004 @@ -84,6 +84,13 @@ return std::string(BufPtr); } +static inline std::string itostr(long X) { + if (X < 0) + return utostr(static_cast(-X), true); + else + return utostr(static_cast(X)); +} + static inline std::string itostr(int X) { if (X < 0) return utostr(static_cast(-X), true); From lattner at cs.uiuc.edu Tue Aug 17 14:12:57 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 14:12:57 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetData.h Message-ID: <200408171912.OAA10577@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/Target: TargetData.h updated: 1.25 -> 1.26 --- Log message: Add punctuation, add a new method --- Diffs of the changes: (+6 -2) Index: llvm/include/llvm/Target/TargetData.h diff -u llvm/include/llvm/Target/TargetData.h:1.25 llvm/include/llvm/Target/TargetData.h:1.26 --- llvm/include/llvm/Target/TargetData.h:1.25 Thu Jul 22 20:08:13 2004 +++ llvm/include/llvm/Target/TargetData.h Tue Aug 17 14:12:44 2004 @@ -87,13 +87,17 @@ unsigned char getPointerSize() const { return PointerSize; } /// getTypeSize - Return the number of bytes necessary to hold the specified - /// type + /// type. uint64_t getTypeSize(const Type *Ty) const; /// getTypeAlignment - Return the minimum required alignment for the specified - /// type + /// type. unsigned char getTypeAlignment(const Type *Ty) const; + /// getTypeAlignmentShift - Return the minimum required alignment for the + /// specified type, returned as log2 of the value (a shift amount). + unsigned char getTypeAlignmentShift(const Type *Ty) const; + /// getIntPtrType - Return an unsigned integer type that is the same size or /// greater to the host pointer size. const Type *getIntPtrType() const; From lattner at cs.uiuc.edu Tue Aug 17 14:13:11 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 14:13:11 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/TargetData.cpp Message-ID: <200408171913.OAA10585@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target: TargetData.cpp updated: 1.50 -> 1.51 --- Log message: Add a new helper method to get log2(type alignment) --- Diffs of the changes: (+7 -0) Index: llvm/lib/Target/TargetData.cpp diff -u llvm/lib/Target/TargetData.cpp:1.50 llvm/lib/Target/TargetData.cpp:1.51 --- llvm/lib/Target/TargetData.cpp:1.50 Thu Jul 22 20:09:52 2004 +++ llvm/lib/Target/TargetData.cpp Tue Aug 17 14:13:00 2004 @@ -21,6 +21,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Constants.h" #include "llvm/Support/GetElementPtrTypeIterator.h" +#include "Support/MathExtras.h" using namespace llvm; // Handle the Pass registration stuff necessary to use TargetData's. @@ -201,6 +202,12 @@ return Align; } +unsigned char TargetData::getTypeAlignmentShift(const Type *Ty) const { + unsigned Align = getTypeAlignment(Ty); + assert(!(Align & (Align-1)) && "Alignment is not a power of two!"); + return log2(Align); +} + /// getIntPtrType - Return an unsigned integer type that is the same size or /// greater to the host pointer size. const Type *TargetData::getIntPtrType() const { From lattner at cs.uiuc.edu Tue Aug 17 14:14:28 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 14:14:28 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/AsmPrinter.h Message-ID: <200408171914.OAA10605@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/CodeGen: AsmPrinter.h updated: 1.6 -> 1.7 --- Log message: Add support for alignment --- Diffs of the changes: (+21 -2) Index: llvm/include/llvm/CodeGen/AsmPrinter.h diff -u llvm/include/llvm/CodeGen/AsmPrinter.h:1.6 llvm/include/llvm/CodeGen/AsmPrinter.h:1.7 --- llvm/include/llvm/CodeGen/AsmPrinter.h:1.6 Tue Aug 17 11:26:36 2004 +++ llvm/include/llvm/CodeGen/AsmPrinter.h Tue Aug 17 14:14:17 2004 @@ -47,7 +47,7 @@ /// CommentChar - This indicates the comment character used by the /// assembler. - const char *CommentChar; + const char *CommentChar; // Defaults to "#" /// GlobalPrefix - If this is set to a non-empty string, it is prepended /// onto all global symbols. This is often used for "_" or ".". @@ -71,6 +71,17 @@ const char *Data32bitsDirective; // Defaults to "\t.long\t" const char *Data64bitsDirective; // Defaults to "\t.quad\t" + /// AlignDirective - The directive used to emit round up to an alignment + /// boundary. + /// + const char *AlignDirective; // Defaults to "\t.align\t" + + /// AlignmentIsInBytes - If this is true (the default) then the asmprinter + /// emits ".align N" directives, where N is the number of bytes to align to. + /// Otherwise, it emits ".align log2(N)", e.g. 3 to align to an 8 byte + /// boundary. + bool AlignmentIsInBytes; // Defaults to true + AsmPrinter(std::ostream &o, TargetMachine &tm) : O(o), TM(tm), CommentChar("#"), @@ -80,7 +91,10 @@ Data8bitsDirective("\t.byte\t"), Data16bitsDirective("\t.short\t"), Data32bitsDirective("\t.long\t"), - Data64bitsDirective("\t.quad\t") { } + Data64bitsDirective("\t.quad\t"), + AlignDirective("\t.align\t"), + AlignmentIsInBytes(true) { + } /// doInitialization - Set up the AsmPrinter when we are working on a new /// module. If your pass overrides this, it must make sure to explicitly @@ -95,6 +109,11 @@ /// is being processed from runOnMachineFunction. void setupMachineFunction(MachineFunction &MF); + /// emitAlignment - Emit an alignment directive to the specified power of + /// two boundary. For example, if you pass in 3 here, you will get an 8 + /// byte alignment. + void emitAlignment(unsigned NumBits) const; + /// emitConstantValueOnly - Print out the specified constant, without a /// storage class. Only constants of first-class type are allowed here. void emitConstantValueOnly(const Constant *CV); From lattner at cs.uiuc.edu Tue Aug 17 14:14:40 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 14:14:40 -0500 Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp Message-ID: <200408171914.OAA10614@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CodeGen: AsmPrinter.cpp updated: 1.6 -> 1.7 --- Log message: Add support for alignment --- Diffs of the changes: (+6 -0) Index: llvm/lib/CodeGen/AsmPrinter.cpp diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.6 llvm/lib/CodeGen/AsmPrinter.cpp:1.7 --- llvm/lib/CodeGen/AsmPrinter.cpp:1.6 Tue Aug 17 11:27:05 2004 +++ llvm/lib/CodeGen/AsmPrinter.cpp Tue Aug 17 14:14:29 2004 @@ -33,6 +33,12 @@ CurrentFnName = Mang->getValueName((Value*)MF.getFunction()); } +// emitAlignment - Emit an alignment directive to the specified power of two. +void AsmPrinter::emitAlignment(unsigned NumBits) const { + if (AlignmentIsInBytes) NumBits = 1 << NumBits; + O << AlignDirective << NumBits << "\n"; +} + // Print out the specified constant, without a storage class. Only the // constants valid in constant expressions can occur here. void AsmPrinter::emitConstantValueOnly(const Constant *CV) { From lattner at cs.uiuc.edu Tue Aug 17 14:17:23 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 14:17:23 -0500 Subject: [llvm-commits] CVS: llvm/include/Support/MathExtras.h Message-ID: <200408171917.OAA10646@apoc.cs.uiuc.edu> Changes in directory llvm/include/Support: MathExtras.h updated: 1.13 -> 1.14 --- Log message: Add an overload --- Diffs of the changes: (+7 -0) Index: llvm/include/Support/MathExtras.h diff -u llvm/include/Support/MathExtras.h:1.13 llvm/include/Support/MathExtras.h:1.14 --- llvm/include/Support/MathExtras.h:1.13 Tue Jul 20 22:15:14 2004 +++ llvm/include/Support/MathExtras.h Tue Aug 17 14:17:10 2004 @@ -29,6 +29,13 @@ return getPow; } +inline unsigned log2(unsigned C) { + unsigned getPow; + for (getPow = 0; C > 1; ++getPow) + C >>= 1; + return getPow; +} + inline bool isPowerOf2(int64_t C, unsigned &getPow) { if (C < 0) C = -C; if (C > 0 && C == (C & ~(C - 1))) { From lattner at cs.uiuc.edu Tue Aug 17 14:25:55 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 14:25:55 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86AsmPrinter.cpp Message-ID: <200408171925.OAA11372@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: X86AsmPrinter.cpp updated: 1.118 -> 1.119 --- Log message: Start using alignment output routines from AsmPrinter. Changes to make this more similar to the ppc asmprinter --- Diffs of the changes: (+8 -10) Index: llvm/lib/Target/X86/X86AsmPrinter.cpp diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.118 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.119 --- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.118 Tue Aug 17 01:48:55 2004 +++ llvm/lib/Target/X86/X86AsmPrinter.cpp Tue Aug 17 14:25:42 2004 @@ -149,9 +149,8 @@ for (unsigned i = 0, e = CP.size(); i != e; ++i) { O << "\t.section .rodata\n"; - O << "\t.align " << (unsigned)TD.getTypeAlignment(CP[i]->getType()) - << "\n"; - O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t#" + emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType())); + O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentChar << *CP[i] << "\n"; emitGlobalConstant(CP[i]); } @@ -169,7 +168,7 @@ // Print out labels for the function. O << "\t.text\n"; - O << "\t.align 16\n"; + emitAlignment(4); O << "\t.globl\t" << CurrentFnName << "\n"; O << "\t.type\t" << CurrentFnName << ", @function\n"; O << CurrentFnName << ":\n"; @@ -178,8 +177,8 @@ for (MachineFunction::const_iterator I = MF.begin(), E = MF.end(); I != E; ++I) { // Print a label for the basic block. - O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t# " - << I->getBasicBlock()->getName() << "\n"; + O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t" + << CommentChar << " " << I->getBasicBlock()->getName() << "\n"; for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); II != E; ++II) { // Print the assembly for the instruction. @@ -387,7 +386,7 @@ std::string name = Mang->getValueName(I); Constant *C = I->getInitializer(); unsigned Size = TD.getTypeSize(C->getType()); - unsigned Align = TD.getTypeAlignment(C->getType()); + unsigned Align = TD.getTypeAlignmentShift(C->getType()); if (C->isNullValue() && (I->hasLinkOnceLinkage() || I->hasInternalLinkage() || @@ -397,7 +396,7 @@ O << "\t.local " << name << "\n"; O << "\t.comm " << name << "," << TD.getTypeSize(C->getType()) - << "," << (unsigned)TD.getTypeAlignment(C->getType()); + << "," << (1 << Align); O << "\t\t# "; WriteAsOperand(O, I, true, true, &M); O << "\n"; @@ -410,7 +409,6 @@ SwitchSection(O, CurSection, ""); O << "\t.section\t.llvm.linkonce.d." << name << ",\"aw\", at progbits\n"; break; - case GlobalValue::AppendingLinkage: // FIXME: appending linkage variables should go into a section of // their name or something. For now, just emit them as external. @@ -426,7 +424,7 @@ break; } - O << "\t.align " << Align << "\n"; + emitAlignment(Align); O << "\t.type " << name << ", at object\n"; O << "\t.size " << name << "," << Size << "\n"; O << name << ":\t\t\t\t# "; From lattner at cs.uiuc.edu Tue Aug 17 14:26:14 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 14:26:14 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp Message-ID: <200408171926.OAA11385@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/PowerPC: PPC32AsmPrinter.cpp updated: 1.50 -> 1.51 --- Log message: Start using alignment output routines from AsmPrinter. Changes to make this more similar to the X86 asmprinter Fix overalignment of globals. --- Diffs of the changes: (+12 -12) Index: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp diff -u llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.50 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.51 --- llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.50 Tue Aug 17 11:27:26 2004 +++ llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp Tue Aug 17 14:26:03 2004 @@ -49,6 +49,7 @@ GlobalPrefix = "_"; ZeroDirective = "\t.space\t"; // ".space N" emits N zeros. Data64bitsDirective = 0; // we can't emit a 64-bit unit + AlignmentIsInBytes = false; // Alignment is by power of 2. } /// Unique incrementer for label values for referencing Global values. @@ -121,9 +122,8 @@ for (unsigned i = 0, e = CP.size(); i != e; ++i) { O << "\t.const\n"; - O << "\t.align " << (unsigned)TD.getTypeAlignment(CP[i]->getType()) - << "\n"; - O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t;" + emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType())); + O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentChar << *CP[i] << "\n"; emitGlobalConstant(CP[i]); } @@ -140,19 +140,19 @@ printConstantPool(MF.getConstantPool()); // Print out labels for the function. - O << "\t.text\n"; + O << "\t.text\n"; + emitAlignment(2); O << "\t.globl\t" << CurrentFnName << "\n"; - O << "\t.align 2\n"; O << CurrentFnName << ":\n"; // Print out code for the function. for (MachineFunction::const_iterator I = MF.begin(), E = MF.end(); I != E; ++I) { // Print a label for the basic block. - O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t; " - << I->getBasicBlock()->getName() << "\n"; + O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t" + << CommentChar << " " << I->getBasicBlock()->getName() << "\n"; for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); - II != E; ++II) { + II != E; ++II) { // Print the assembly for the instruction. O << "\t"; printMachineInstruction(II); @@ -399,14 +399,14 @@ std::string name = Mang->getValueName(I); Constant *C = I->getInitializer(); unsigned Size = TD.getTypeSize(C->getType()); - unsigned Align = TD.getTypeAlignment(C->getType()); + unsigned Align = TD.getTypeAlignmentShift(C->getType()); if (C->isNullValue() && /* FIXME: Verify correct */ (I->hasInternalLinkage() || I->hasWeakLinkage())) { SwitchSection(O, CurSection, ".data"); if (I->hasInternalLinkage()) O << ".lcomm " << name << "," << TD.getTypeSize(C->getType()) - << "," << (unsigned)TD.getTypeAlignment(C->getType()); + << "," << Align; else O << ".comm " << name << "," << TD.getTypeSize(C->getType()); O << "\t\t; "; @@ -439,7 +439,7 @@ break; } - O << "\t.align " << Align << "\n"; + emitAlignment(Align); O << name << ":\t\t\t\t; "; WriteAsOperand(O, I, true, true, &M); O << " = "; @@ -455,7 +455,7 @@ { O << ".data\n"; O << ".section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32\n"; - O << "\t.align 2\n"; + emitAlignment(2); O << "L" << *i << "$stub:\n"; O << "\t.indirect_symbol " << *i << "\n"; O << "\tmflr r0\n"; From criswell at cs.uiuc.edu Tue Aug 17 14:36:33 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue, 17 Aug 2004 14:36:33 -0500 Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile.programs Message-ID: <200408171936.OAA01561@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs: Makefile.programs updated: 1.133 -> 1.134 --- Log message: Add rule to update Makefiles. This should get all of the Makefiles, but won't properly update the Makefile Makefiles, like Makefile.multisrc. --- Diffs of the changes: (+8 -0) Index: llvm/test/Programs/Makefile.programs diff -u llvm/test/Programs/Makefile.programs:1.133 llvm/test/Programs/Makefile.programs:1.134 --- llvm/test/Programs/Makefile.programs:1.133 Sat Jul 24 02:54:16 2004 +++ llvm/test/Programs/Makefile.programs Tue Aug 17 14:36:21 2004 @@ -604,3 +604,11 @@ clean:: rm -f report.*.raw.out report.*.txt report.*.html report.*.tex + +# If the Makefile in the source tree has been updated, copy it over into the +# build tree. +Makefile :: $(BUILD_SRC_DIR)/Makefile + @${ECHO} "===== Updating Makefile from source dir: `dirname $<` =====" + $(MKDIR) $(@D) + cp -f $< $@ + From brukman at cs.uiuc.edu Tue Aug 17 15:23:44 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 17 Aug 2004 15:23:44 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PowerPC.td Message-ID: <200408172023.PAA12994@zion.cs.uiuc.edu> Changes in directory llvm/lib/Target/PowerPC: PowerPC.td (r1.7) removed --- Log message: This file is no longer used. --- Diffs of the changes: (+0 -0) From lattner at cs.uiuc.edu Tue Aug 17 16:38:52 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 16:38:52 -0500 Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp Message-ID: <200408172138.QAA01779@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CodeGen: AsmPrinter.cpp updated: 1.7 -> 1.8 --- Log message: Add support for targets without a .zero directive --- Diffs of the changes: (+23 -4) Index: llvm/lib/CodeGen/AsmPrinter.cpp diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.7 llvm/lib/CodeGen/AsmPrinter.cpp:1.8 --- llvm/lib/CodeGen/AsmPrinter.cpp:1.7 Tue Aug 17 14:14:29 2004 +++ llvm/lib/CodeGen/AsmPrinter.cpp Tue Aug 17 16:38:40 2004 @@ -39,6 +39,25 @@ O << AlignDirective << NumBits << "\n"; } +/// emitZeros - Emit a block of zeros. +/// +void AsmPrinter::emitZeros(unsigned NumZeros) const { + if (NumZeros) { + if (ZeroDirective) + O << ZeroDirective << NumZeros << "\n"; + else { + if (NumZeros >= 8 && Data64bitsDirective) { + for (; NumZeros >= 8; NumZeros -= 8) + O << Data64bitsDirective << "0\n"; + } + for (; NumZeros >= 4; NumZeros -= 4) + O << Data32bitsDirective << "0\n"; + for (; NumZeros; --NumZeros) + O << Data8bitsDirective << "0\n"; + } + } +} + // Print out the specified constant, without a storage class. Only the // constants valid in constant expressions can occur here. void AsmPrinter::emitConstantValueOnly(const Constant *CV) { @@ -159,7 +178,7 @@ const TargetData &TD = TM.getTargetData(); if (CV->isNullValue()) { - O << ZeroDirective << TD.getTypeSize(CV->getType()) << "\n"; + emitZeros(TD.getTypeSize(CV->getType())); return; } else if (const ConstantArray *CVA = dyn_cast(CV)) { if (CVA->isString()) { @@ -189,8 +208,7 @@ emitGlobalConstant(field); // Insert the field padding unless it's zero bytes... - if (padSize) - O << ZeroDirective << padSize << "\n"; + emitZeros(padSize); } assert(sizeSoFar == cvsLayout->StructSize && "Layout of constant struct may be incorrect!"); @@ -207,7 +225,8 @@ U.FVal = Val; if (Data64bitsDirective) - O << Data64bitsDirective << U.UVal << "\n"; + O << Data64bitsDirective << U.UVal << "\t" << CommentChar + << " double value: " << Val << "\n"; else if (TD.isBigEndian()) { O << Data32bitsDirective << unsigned(U.UVal >> 32) << "\t" << CommentChar << " double most significant word " From lattner at cs.uiuc.edu Tue Aug 17 16:39:02 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 16:39:02 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/AsmPrinter.h Message-ID: <200408172139.QAA01789@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/CodeGen: AsmPrinter.h updated: 1.7 -> 1.8 --- Log message: new method --- Diffs of the changes: (+4 -0) Index: llvm/include/llvm/CodeGen/AsmPrinter.h diff -u llvm/include/llvm/CodeGen/AsmPrinter.h:1.7 llvm/include/llvm/CodeGen/AsmPrinter.h:1.8 --- llvm/include/llvm/CodeGen/AsmPrinter.h:1.7 Tue Aug 17 14:14:17 2004 +++ llvm/include/llvm/CodeGen/AsmPrinter.h Tue Aug 17 16:38:51 2004 @@ -114,6 +114,10 @@ /// byte alignment. void emitAlignment(unsigned NumBits) const; + /// emitZeros - Emit a block of zeros. + /// + void emitZeros(unsigned NumZeros) const; + /// emitConstantValueOnly - Print out the specified constant, without a /// storage class. Only constants of first-class type are allowed here. void emitConstantValueOnly(const Constant *CV); From llvm at cs.uiuc.edu Tue Aug 17 17:26:28 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Tue, 17 Aug 2004 17:26:28 -0500 Subject: [llvm-commits] CVS: llvm/projects/Small/ Message-ID: <200408172226.RAA14696@zion.cs.uiuc.edu> Changes in directory llvm/projects/Small: --- Log message: Directory /var/cvs/llvm/llvm/projects/Small added to the repository --- Diffs of the changes: (+0 -0) From lattner at cs.uiuc.edu Tue Aug 17 21:22:46 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 21:22:46 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/AsmPrinter.h Message-ID: <200408180222.VAA04946@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/CodeGen: AsmPrinter.h updated: 1.8 -> 1.9 --- Log message: Alkis pointed out that this is not a character (we actually support strings) and as such, we should use self revealing names. Hey, makes sense to me! --- Diffs of the changes: (+3 -3) Index: llvm/include/llvm/CodeGen/AsmPrinter.h diff -u llvm/include/llvm/CodeGen/AsmPrinter.h:1.8 llvm/include/llvm/CodeGen/AsmPrinter.h:1.9 --- llvm/include/llvm/CodeGen/AsmPrinter.h:1.8 Tue Aug 17 16:38:51 2004 +++ llvm/include/llvm/CodeGen/AsmPrinter.h Tue Aug 17 21:22:34 2004 @@ -45,9 +45,9 @@ // Properties to be set by the derived class ctor, used to configure the // asmwriter. - /// CommentChar - This indicates the comment character used by the + /// CommentString - This indicates the comment character used by the /// assembler. - const char *CommentChar; // Defaults to "#" + const char *CommentString; // Defaults to "#" /// GlobalPrefix - If this is set to a non-empty string, it is prepended /// onto all global symbols. This is often used for "_" or ".". @@ -84,7 +84,7 @@ AsmPrinter(std::ostream &o, TargetMachine &tm) : O(o), TM(tm), - CommentChar("#"), + CommentString("#"), GlobalPrefix(""), ZeroDirective("\t.zero\t"), AsciiDirective("\t.ascii\t"), From lattner at cs.uiuc.edu Tue Aug 17 21:22:54 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 21:22:54 -0500 Subject: [llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp Message-ID: <200408180222.VAA04957@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CodeGen: AsmPrinter.cpp updated: 1.8 -> 1.9 --- Log message: Rename var --- Diffs of the changes: (+10 -10) Index: llvm/lib/CodeGen/AsmPrinter.cpp diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.8 llvm/lib/CodeGen/AsmPrinter.cpp:1.9 --- llvm/lib/CodeGen/AsmPrinter.cpp:1.8 Tue Aug 17 16:38:40 2004 +++ llvm/lib/CodeGen/AsmPrinter.cpp Tue Aug 17 21:22:44 2004 @@ -225,21 +225,21 @@ U.FVal = Val; if (Data64bitsDirective) - O << Data64bitsDirective << U.UVal << "\t" << CommentChar + O << Data64bitsDirective << U.UVal << "\t" << CommentString << " double value: " << Val << "\n"; else if (TD.isBigEndian()) { O << Data32bitsDirective << unsigned(U.UVal >> 32) - << "\t" << CommentChar << " double most significant word " + << "\t" << CommentString << " double most significant word " << Val << "\n"; O << Data32bitsDirective << unsigned(U.UVal) - << "\t" << CommentChar << " double least significant word " + << "\t" << CommentString << " double least significant word " << Val << "\n"; } else { O << Data32bitsDirective << unsigned(U.UVal) - << "\t" << CommentChar << " double least significant word " << Val + << "\t" << CommentString << " double least significant word " << Val << "\n"; O << Data32bitsDirective << unsigned(U.UVal >> 32) - << "\t" << CommentChar << " double most significant word " << Val + << "\t" << CommentString << " double most significant word " << Val << "\n"; } return; @@ -250,7 +250,7 @@ } U; U.FVal = Val; - O << Data32bitsDirective << U.UVal << "\t" << CommentChar + O << Data32bitsDirective << U.UVal << "\t" << CommentString << " float " << Val << "\n"; return; } @@ -262,17 +262,17 @@ O << Data64bitsDirective << Val << "\n"; else if (TD.isBigEndian()) { O << Data32bitsDirective << unsigned(Val >> 32) - << "\t" << CommentChar << " Double-word most significant word " + << "\t" << CommentString << " Double-word most significant word " << Val << "\n"; O << Data32bitsDirective << unsigned(Val) - << "\t" << CommentChar << " Double-word least significant word " + << "\t" << CommentString << " Double-word least significant word " << Val << "\n"; } else { O << Data32bitsDirective << unsigned(Val) - << "\t" << CommentChar << " Double-word least significant word " + << "\t" << CommentString << " Double-word least significant word " << Val << "\n"; O << Data32bitsDirective << unsigned(Val >> 32) - << "\t" << CommentChar << " Double-word most significant word " + << "\t" << CommentString << " Double-word most significant word " << Val << "\n"; } return; From lattner at cs.uiuc.edu Tue Aug 17 21:23:03 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 21:23:03 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86AsmPrinter.cpp Message-ID: <200408180223.VAA04969@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: X86AsmPrinter.cpp updated: 1.119 -> 1.120 --- Log message: Rename var --- Diffs of the changes: (+2 -2) Index: llvm/lib/Target/X86/X86AsmPrinter.cpp diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.119 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.120 --- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.119 Tue Aug 17 14:25:42 2004 +++ llvm/lib/Target/X86/X86AsmPrinter.cpp Tue Aug 17 21:22:53 2004 @@ -150,7 +150,7 @@ for (unsigned i = 0, e = CP.size(); i != e; ++i) { O << "\t.section .rodata\n"; emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType())); - O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentChar + O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentString << *CP[i] << "\n"; emitGlobalConstant(CP[i]); } @@ -178,7 +178,7 @@ I != E; ++I) { // Print a label for the basic block. O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t" - << CommentChar << " " << I->getBasicBlock()->getName() << "\n"; + << CommentString << " " << I->getBasicBlock()->getName() << "\n"; for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); II != E; ++II) { // Print the assembly for the instruction. From lattner at cs.uiuc.edu Tue Aug 17 21:23:05 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue, 17 Aug 2004 21:23:05 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp Message-ID: <200408180223.VAA04975@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/PowerPC: PPC32AsmPrinter.cpp updated: 1.51 -> 1.52 --- Log message: Rename var --- Diffs of the changes: (+3 -3) Index: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp diff -u llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.51 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.52 --- llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.51 Tue Aug 17 14:26:03 2004 +++ llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp Tue Aug 17 21:22:55 2004 @@ -45,7 +45,7 @@ PPC32AsmPrinter(std::ostream &O, TargetMachine &TM) : AsmPrinter(O, TM), LabelNumber(0) { - CommentChar = ";"; + CommentString = ";"; GlobalPrefix = "_"; ZeroDirective = "\t.space\t"; // ".space N" emits N zeros. Data64bitsDirective = 0; // we can't emit a 64-bit unit @@ -123,7 +123,7 @@ for (unsigned i = 0, e = CP.size(); i != e; ++i) { O << "\t.const\n"; emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType())); - O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentChar + O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentString << *CP[i] << "\n"; emitGlobalConstant(CP[i]); } @@ -150,7 +150,7 @@ I != E; ++I) { // Print a label for the basic block. O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t" - << CommentChar << " " << I->getBasicBlock()->getName() << "\n"; + << CommentString << " " << I->getBasicBlock()->getName() << "\n"; for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); II != E; ++II) { // Print the assembly for the instruction. From lattner at cs.uiuc.edu Wed Aug 18 00:29:20 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed, 18 Aug 2004 00:29:20 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp SparcV9Internals.h Message-ID: <200408180529.AAA05345@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/SparcV9: SparcV9AsmPrinter.cpp updated: 1.118 -> 1.119 SparcV9Internals.h updated: 1.114 -> 1.115 --- Log message: Switch V9 over to using the AsmPrinter base class to do its constant printing Massive thanks to the brg miester for doing the testing. :) --- Diffs of the changes: (+91 -505) Index: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp diff -u llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.118 llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.119 --- llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.118 Mon Aug 16 16:54:29 2004 +++ llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp Wed Aug 18 00:29:08 2004 @@ -23,6 +23,7 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Assembly/Writer.h" +#include "llvm/CodeGen/AsmPrinter.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineInstr.h" @@ -36,141 +37,11 @@ namespace { Statistic<> EmittedInsts("asm-printer", "Number of machine instrs printed"); - - //===--------------------------------------------------------------------===// - // Utility functions - - /// getAsCString - Return the specified array as a C compatible string, only - /// if the predicate isString() is true. - /// - std::string getAsCString(const ConstantArray *CVA) { - assert(CVA->isString() && "Array is not string compatible!"); - - std::string Result = "\""; - for (unsigned i = 0; i != CVA->getNumOperands(); ++i) { - unsigned char C = cast(CVA->getOperand(i))->getRawValue(); - - if (C == '"') { - Result += "\\\""; - } else if (C == '\\') { - Result += "\\\\"; - } else if (isprint(C)) { - Result += C; - } else { - Result += '\\'; // print all other chars as octal value - // Convert C to octal representation - Result += ((C >> 6) & 7) + '0'; - Result += ((C >> 3) & 7) + '0'; - Result += ((C >> 0) & 7) + '0'; - } - } - Result += "\""; - - return Result; - } - - inline bool ArrayTypeIsString(const ArrayType* arrayType) { - return (arrayType->getElementType() == Type::UByteTy || - arrayType->getElementType() == Type::SByteTy); - } - - unsigned findOptimalStorageSize(const TargetMachine &TM, const Type *Ty) { - // All integer types smaller than ints promote to 4 byte integers. - if (Ty->isIntegral() && Ty->getPrimitiveSize() < 4) - return 4; - - return TM.getTargetData().getTypeSize(Ty); - } - - - inline const std::string - TypeToDataDirective(const Type* type) { - switch(type->getTypeID()) { - case Type::BoolTyID: case Type::UByteTyID: case Type::SByteTyID: - return ".byte"; - case Type::UShortTyID: case Type::ShortTyID: - return ".half"; - case Type::UIntTyID: case Type::IntTyID: - return ".word"; - case Type::ULongTyID: case Type::LongTyID: case Type::PointerTyID: - return ".xword"; - case Type::FloatTyID: - return ".word"; - case Type::DoubleTyID: - return ".xword"; - case Type::ArrayTyID: - if (ArrayTypeIsString((ArrayType*) type)) - return ".ascii"; - else - return ""; - default: - return ""; - } - } - - /// Get the size of the constant for the given target. - /// If this is an unsized array, return 0. - /// - inline unsigned int - ConstantToSize(const Constant* CV, const TargetMachine& target) { - if (const ConstantArray* CVA = dyn_cast(CV)) { - const ArrayType *aty = cast(CVA->getType()); - if (ArrayTypeIsString(aty)) - return 1 + CVA->getNumOperands(); - } - - return findOptimalStorageSize(target, CV->getType()); - } - - /// Align data larger than one L1 cache line on L1 cache line boundaries. - /// Align all smaller data on the next higher 2^x boundary (4, 8, ...). - /// - inline unsigned int - SizeToAlignment(unsigned int size, const TargetMachine& target) { - const unsigned short cacheLineSize = 16; - if (size > (unsigned) cacheLineSize / 2) - return cacheLineSize; - else - for (unsigned sz=1; /*no condition*/; sz *= 2) - if (sz >= size) - return sz; - } - - /// Get the size of the type and then use SizeToAlignment. - /// - inline unsigned int - TypeToAlignment(const Type* type, const TargetMachine& target) { - return SizeToAlignment(findOptimalStorageSize(target, type), target); - } - - /// Get the size of the constant and then use SizeToAlignment. - /// Handles strings as a special case; - inline unsigned int - ConstantToAlignment(const Constant* CV, const TargetMachine& target) { - if (const ConstantArray* CVA = dyn_cast(CV)) - if (ArrayTypeIsString(cast(CVA->getType()))) - return SizeToAlignment(1 + CVA->getNumOperands(), target); - - return TypeToAlignment(CV->getType(), target); - } - -} // End anonymous namespace - - - -//===---------------------------------------------------------------------===// -// Code abstracted away from the AsmPrinter -//===---------------------------------------------------------------------===// +} namespace { - class AsmPrinter { - // Mangle symbol names appropriately - Mangler *Mang; - + struct SparcV9AsmPrinter : public AsmPrinter { public: - std::ostream &toAsm; - const TargetMachine &Target; - enum Sections { Unknown, Text, @@ -179,64 +50,32 @@ ZeroInitRWData, } CurSection; - AsmPrinter(std::ostream &os, const TargetMachine &T) - : /* idTable(0), */ toAsm(os), Target(T), CurSection(Unknown) {} - - ~AsmPrinter() { - delete Mang; - } - - // (start|end)(Module|Function) - Callback methods invoked by subclasses - void startModule(Module &M) { - Mang = new Mangler(M); + SparcV9AsmPrinter(std::ostream &OS, TargetMachine &TM) + : AsmPrinter(OS, TM), CurSection(Unknown) { + ZeroDirective = 0; // No way to get zeros. + Data16bitsDirective = "\t.half\t"; + Data32bitsDirective = "\t.word\t"; + Data64bitsDirective = "\t.xword\t"; + CommentString = "!"; } - void PrintZeroBytesToPad(int numBytes) { - // - // Always use single unsigned bytes for padding. We don't know upon - // what data size the beginning address is aligned, so using anything - // other than a byte may cause alignment errors in the assembler. - // - while (numBytes--) - printSingleConstantValue(Constant::getNullValue(Type::UByteTy)); + const char *getPassName() const { + return "SparcV9 Assembly Printer"; } - /// Print a single constant value. - /// - void printSingleConstantValue(const Constant* CV); - - /// Print a constant value or values (it may be an aggregate). - /// Uses printSingleConstantValue() to print each individual value. - /// - void printConstantValueOnly(const Constant* CV, int numPadBytesAfter = 0); - // Print a constant (which may be an aggregate) prefixed by all the // appropriate directives. Uses printConstantValueOnly() to print the // value or values. - void printConstant(const Constant* CV, std::string valID = "") { - if (valID.length() == 0) - valID = getID(CV); - - toAsm << "\t.align\t" << ConstantToAlignment(CV, Target) << "\n"; - - // Print .size and .type only if it is not a string. - if (const ConstantArray *CVA = dyn_cast(CV)) - if (CVA->isString()) { - // print it as a string and return - toAsm << valID << ":\n"; - toAsm << "\t" << ".ascii" << "\t" << getAsCString(CVA) << "\n"; - return; - } - - toAsm << "\t.type" << "\t" << valID << ",#object\n"; + void printConstant(const Constant* CV, const std::string &valID) { + emitAlignment(TM.getTargetData().getTypeAlignmentShift(CV->getType())); + O << "\t.type" << "\t" << valID << ",#object\n"; - unsigned int constSize = ConstantToSize(CV, Target); - if (constSize) - toAsm << "\t.size" << "\t" << valID << "," << constSize << "\n"; + unsigned constSize = TM.getTargetData().getTypeSize(CV->getType()); + O << "\t.size" << "\t" << valID << "," << constSize << "\n"; - toAsm << valID << ":\n"; + O << valID << ":\n"; - printConstantValueOnly(CV); + emitGlobalConstant(CV); } // enterSection - Use this method to enter a different section of the output @@ -246,16 +85,16 @@ if (S == CurSection) return; // Only switch section if necessary CurSection = S; - toAsm << "\n\t.section "; + O << "\n\t.section "; switch (S) { default: assert(0 && "Bad section name!"); - case Text: toAsm << "\".text\""; break; - case ReadOnlyData: toAsm << "\".rodata\",#alloc"; break; - case InitRWData: toAsm << "\".data\",#alloc,#write"; break; - case ZeroInitRWData: toAsm << "\".bss\",#alloc,#write"; break; + case Text: O << "\".text\""; break; + case ReadOnlyData: O << "\".rodata\",#alloc"; break; + case InitRWData: O << "\".data\",#alloc,#write"; break; + case ZeroInitRWData: O << "\".bss\",#alloc,#write"; break; } - toAsm << "\n"; + O << "\n"; } // getID Wrappers - Ensure consistent usage @@ -283,263 +122,19 @@ return ""; } - // Combines expressions - inline std::string ConstantArithExprToString(const ConstantExpr* CE, - const TargetMachine &TM, - const std::string &op) { - return "(" + valToExprString(CE->getOperand(0), TM) + op - + valToExprString(CE->getOperand(1), TM) + ")"; - } - - /// ConstantExprToString() - Convert a ConstantExpr to an asm expression - /// and return this as a string. - /// - std::string ConstantExprToString(const ConstantExpr* CE, - const TargetMachine& target); - - /// valToExprString - Helper function for ConstantExprToString(). - /// Appends result to argument string S. - /// - std::string valToExprString(const Value* V, const TargetMachine& target); - }; -} // End anonymous namespace - - -/// Print a single constant value. -/// -void AsmPrinter::printSingleConstantValue(const Constant* CV) { - assert(CV->getType() != Type::VoidTy && - CV->getType() != Type::LabelTy && - "Unexpected type for Constant"); - - assert((!isa(CV) && ! isa(CV)) - && "Aggregate types should be handled outside this function"); - - toAsm << "\t" << TypeToDataDirective(CV->getType()) << "\t"; - - if (const GlobalValue* GV = dyn_cast(CV)) { - toAsm << getID(GV) << "\n"; - } else if (isa(CV)) { - // Null pointer value - toAsm << "0\n"; - } else if (const ConstantExpr* CE = dyn_cast(CV)) { - // Constant expression built from operators, constants, and symbolic addrs - toAsm << ConstantExprToString(CE, Target) << "\n"; - } else if (CV->getType()->isPrimitiveType()) { - // Check primitive types last - if (CV->getType()->isFloatingPoint()) { - // FP Constants are printed as integer constants to avoid losing - // precision... - double Val = cast(CV)->getValue(); - if (CV->getType() == Type::FloatTy) { - float FVal = (float)Val; - char *ProxyPtr = (char*)&FVal; // Abide by C TBAA rules - toAsm << *(unsigned int*)ProxyPtr; - } else if (CV->getType() == Type::DoubleTy) { - char *ProxyPtr = (char*)&Val; // Abide by C TBAA rules - toAsm << *(uint64_t*)ProxyPtr; - } else { - assert(0 && "Unknown floating point type!"); - } - - toAsm << "\t! " << CV->getType()->getDescription() - << " value: " << Val << "\n"; - } else if (const ConstantBool *CB = dyn_cast(CV)) { - toAsm << (int)CB->getValue() << "\n"; - } else { - WriteAsOperand(toAsm, CV, false, false) << "\n"; - } - } else { - assert(0 && "Unknown elementary type for constant"); - } -} - -/// Print a constant value or values (it may be an aggregate). -/// Uses printSingleConstantValue() to print each individual value. -/// -void AsmPrinter::printConstantValueOnly(const Constant* CV, - int numPadBytesAfter) { - if (const ConstantArray *CVA = dyn_cast(CV)) { - if (CVA->isString()) { - // print the string alone and return - toAsm << "\t" << ".ascii" << "\t" << getAsCString(CVA) << "\n"; - } else { - // Not a string. Print the values in successive locations - for (unsigned i = 0, e = CVA->getNumOperands(); i != e; ++i) - printConstantValueOnly(CVA->getOperand(i)); - } - } else if (const ConstantStruct *CVS = dyn_cast(CV)) { - // Print the fields in successive locations. Pad to align if needed! - const StructLayout *cvsLayout = - Target.getTargetData().getStructLayout(CVS->getType()); - unsigned sizeSoFar = 0; - for (unsigned i = 0, e = CVS->getNumOperands(); i != e; ++i) { - const Constant* field = CVS->getOperand(i); - - // Check if padding is needed and insert one or more 0s. - unsigned fieldSize = - Target.getTargetData().getTypeSize(field->getType()); - int padSize = ((i == e-1? cvsLayout->StructSize - : cvsLayout->MemberOffsets[i+1]) - - cvsLayout->MemberOffsets[i]) - fieldSize; - sizeSoFar += (fieldSize + padSize); - - // Now print the actual field value - printConstantValueOnly(field, padSize); - } - assert(sizeSoFar == cvsLayout->StructSize && - "Layout of constant struct may be incorrect!"); - } else if (isa(CV)) { - PrintZeroBytesToPad(Target.getTargetData().getTypeSize(CV->getType())); - } else - printSingleConstantValue(CV); - - if (numPadBytesAfter) - PrintZeroBytesToPad(numPadBytesAfter); -} - -/// ConstantExprToString() - Convert a ConstantExpr to an asm expression -/// and return this as a string. -/// -std::string AsmPrinter::ConstantExprToString(const ConstantExpr* CE, - const TargetMachine& target) { - std::string S; - switch(CE->getOpcode()) { - case Instruction::GetElementPtr: - { // generate a symbolic expression for the byte address - const Value* ptrVal = CE->getOperand(0); - std::vector idxVec(CE->op_begin()+1, CE->op_end()); - const TargetData &TD = target.getTargetData(); - S += "(" + valToExprString(ptrVal, target) + ") + (" - + utostr(TD.getIndexedOffset(ptrVal->getType(),idxVec)) + ")"; - break; - } - - case Instruction::Cast: - // Support only non-converting casts for now, i.e., a no-op. - // This assertion is not a complete check. - assert(target.getTargetData().getTypeSize(CE->getType()) == - target.getTargetData().getTypeSize(CE->getOperand(0)->getType())); - S += "(" + valToExprString(CE->getOperand(0), target) + ")"; - break; - - case Instruction::Add: - S += ConstantArithExprToString(CE, target, ") + ("); - break; - - case Instruction::Sub: - S += ConstantArithExprToString(CE, target, ") - ("); - break; - - case Instruction::Mul: - S += ConstantArithExprToString(CE, target, ") * ("); - break; - - case Instruction::Div: - S += ConstantArithExprToString(CE, target, ") / ("); - break; - - case Instruction::Rem: - S += ConstantArithExprToString(CE, target, ") % ("); - break; - - case Instruction::And: - // Logical && for booleans; bitwise & otherwise - S += ConstantArithExprToString(CE, target, - ((CE->getType() == Type::BoolTy)? ") && (" : ") & (")); - break; - - case Instruction::Or: - // Logical || for booleans; bitwise | otherwise - S += ConstantArithExprToString(CE, target, - ((CE->getType() == Type::BoolTy)? ") || (" : ") | (")); - break; - - case Instruction::Xor: - // Bitwise ^ for all types - S += ConstantArithExprToString(CE, target, ") ^ ("); - break; - - default: - assert(0 && "Unsupported operator in ConstantExprToString()"); - break; - } - - return S; -} - -/// valToExprString - Helper function for ConstantExprToString(). -/// Appends result to argument string S. -/// -std::string AsmPrinter::valToExprString(const Value* V, - const TargetMachine& target) { - std::string S; - bool failed = false; - if (const GlobalValue* GV = dyn_cast(V)) { - S += getID(GV); - } else if (const Constant* CV = dyn_cast(V)) { // symbolic or known - if (const ConstantBool *CB = dyn_cast(CV)) - S += std::string(CB == ConstantBool::True ? "1" : "0"); - else if (const ConstantSInt *CI = dyn_cast(CV)) - S += itostr(CI->getValue()); - else if (const ConstantUInt *CI = dyn_cast(CV)) - S += utostr(CI->getValue()); - else if (const ConstantFP *CFP = dyn_cast(CV)) - S += ftostr(CFP->getValue()); - else if (isa(CV)) - S += "0"; - else if (const ConstantExpr *CE = dyn_cast(CV)) - S += ConstantExprToString(CE, target); - else - failed = true; - } else - failed = true; - - if (failed) { - assert(0 && "Cannot convert value to string"); - S += ""; - } - return S; -} - - -//===----------------------------------------------------------------------===// -// SparcV9AsmPrinter Code -//===----------------------------------------------------------------------===// - -namespace { - - struct SparcV9AsmPrinter : public FunctionPass, public AsmPrinter { - inline SparcV9AsmPrinter(std::ostream &os, const TargetMachine &t) - : AsmPrinter(os, t) {} - - const Function *currFunction; - - const char *getPassName() const { - return "Output SparcV9 Assembly for Functions"; - } - - virtual bool doInitialization(Module &M) { - startModule(M); - return false; - } - - virtual bool runOnFunction(Function &F) { - currFunction = &F; - emitFunction(F); + virtual bool runOnMachineFunction(MachineFunction &MF) { + setupMachineFunction(MF); + emitFunction(MF); return false; } virtual bool doFinalization(Module &M) { emitGlobals(M); + AsmPrinter::doFinalization(M); return false; } - virtual void getAnalysisUsage(AnalysisUsage &AU) const { - AU.setPreservesAll(); - } - - void emitFunction(const Function &F); + void emitFunction(MachineFunction &F); private : void emitBasicBlock(const MachineBasicBlock &MBB); void emitMachineInst(const MachineInstr *MI); @@ -581,33 +176,28 @@ inline bool SparcV9AsmPrinter::OpIsMemoryAddressBase(const MachineInstr *MI, unsigned int opNum) { - if (Target.getInstrInfo()->isLoad(MI->getOpcode())) + if (TM.getInstrInfo()->isLoad(MI->getOpcode())) return (opNum == 0); - else if (Target.getInstrInfo()->isStore(MI->getOpcode())) + else if (TM.getInstrInfo()->isStore(MI->getOpcode())) return (opNum == 1); else return false; } - -#define PrintOp1PlusOp2(mop1, mop2, opCode) \ - printOneOperand(mop1, opCode); \ - toAsm << "+"; \ - printOneOperand(mop2, opCode); - unsigned int -SparcV9AsmPrinter::printOperands(const MachineInstr *MI, - unsigned int opNum) -{ +SparcV9AsmPrinter::printOperands(const MachineInstr *MI, unsigned opNum) { const MachineOperand& mop = MI->getOperand(opNum); - if (OpIsBranchTargetLabel(MI, opNum)) { - PrintOp1PlusOp2(mop, MI->getOperand(opNum+1), MI->getOpcode()); + printOneOperand(mop, MI->getOpcode()); + O << "+"; + printOneOperand(MI->getOperand(opNum+1), MI->getOpcode()); return 2; } else if (OpIsMemoryAddressBase(MI, opNum)) { - toAsm << "["; - PrintOp1PlusOp2(mop, MI->getOperand(opNum+1), MI->getOpcode()); - toAsm << "]"; + O << "["; + printOneOperand(mop, MI->getOpcode()); + O << "+"; + printOneOperand(MI->getOperand(opNum+1), MI->getOpcode()); + O << "]"; return 2; } else { printOneOperand(mop, MI->getOpcode()); @@ -617,18 +207,18 @@ void SparcV9AsmPrinter::printOneOperand(const MachineOperand &mop, - MachineOpCode opCode) + MachineOpCode opCode) { bool needBitsFlag = true; if (mop.isHiBits32()) - toAsm << "%lm("; + O << "%lm("; else if (mop.isLoBits32()) - toAsm << "%lo("; + O << "%lo("; else if (mop.isHiBits64()) - toAsm << "%hh("; + O << "%hh("; else if (mop.isLoBits64()) - toAsm << "%hm("; + O << "%hm("; else needBitsFlag = false; @@ -640,19 +230,18 @@ { int regNum = (int)mop.getReg(); - if (regNum == Target.getRegInfo()->getInvalidRegNum()) { + if (regNum == TM.getRegInfo()->getInvalidRegNum()) { // better to print code with NULL registers than to die - toAsm << ""; + O << ""; } else { - toAsm << "%" << Target.getRegInfo()->getUnifiedRegName(regNum); + O << "%" << TM.getRegInfo()->getUnifiedRegName(regNum); } break; } case MachineOperand::MO_ConstantPoolIndex: { - toAsm << ".CPI_" << getID(currFunction) - << "_" << mop.getConstantPoolIndex(); + O << ".CPI_" << CurrentFnName << "_" << mop.getConstantPoolIndex(); break; } @@ -662,42 +251,42 @@ assert(Val && "\tNULL Value in SparcV9AsmPrinter"); if (const BasicBlock *BB = dyn_cast(Val)) - toAsm << getID(BB); + O << getID(BB); else if (const Function *F = dyn_cast(Val)) - toAsm << getID(F); + O << getID(F); else if (const GlobalVariable *GV = dyn_cast(Val)) - toAsm << getID(GV); + O << getID(GV); else if (const Constant *CV = dyn_cast(Val)) - toAsm << getID(CV); + O << getID(CV); else assert(0 && "Unrecognized value in SparcV9AsmPrinter"); break; } case MachineOperand::MO_SignExtendedImmed: - toAsm << mop.getImmedValue(); + O << mop.getImmedValue(); break; case MachineOperand::MO_UnextendedImmed: - toAsm << (uint64_t) mop.getImmedValue(); + O << (uint64_t) mop.getImmedValue(); break; default: - toAsm << mop; // use dump field + O << mop; // use dump field break; } if (needBitsFlag) - toAsm << ")"; + O << ")"; } void SparcV9AsmPrinter::emitMachineInst(const MachineInstr *MI) { unsigned Opcode = MI->getOpcode(); - if (Target.getInstrInfo()->isDummyPhiInstr(Opcode)) + if (TM.getInstrInfo()->isDummyPhiInstr(Opcode)) return; // IGNORE PHI NODES - toAsm << "\t" << Target.getInstrInfo()->getName(Opcode) << "\t"; + O << "\t" << TM.getInstrInfo()->getName(Opcode) << "\t"; unsigned Mask = getOperandMask(Opcode); @@ -705,74 +294,72 @@ unsigned N = 1; for (unsigned OpNum = 0; OpNum < MI->getNumOperands(); OpNum += N) if (! ((1 << OpNum) & Mask)) { // Ignore this operand? - if (NeedComma) toAsm << ", "; // Handle comma outputting + if (NeedComma) O << ", "; // Handle comma outputting NeedComma = true; N = printOperands(MI, OpNum); } else N = 1; - toAsm << "\n"; + O << "\n"; ++EmittedInsts; } void SparcV9AsmPrinter::emitBasicBlock(const MachineBasicBlock &MBB) { // Emit a label for the basic block - toAsm << getID(MBB.getBasicBlock()) << ":\n"; + O << getID(MBB.getBasicBlock()) << ":\n"; // Loop over all of the instructions in the basic block... for (MachineBasicBlock::const_iterator MII = MBB.begin(), MIE = MBB.end(); MII != MIE; ++MII) emitMachineInst(MII); - toAsm << "\n"; // Separate BB's with newlines + O << "\n"; // Separate BB's with newlines } -void SparcV9AsmPrinter::emitFunction(const Function &F) { - std::string methName = getID(&F); - toAsm << "!****** Outputing Function: " << methName << " ******\n"; +void SparcV9AsmPrinter::emitFunction(MachineFunction &MF) { + O << "!****** Outputing Function: " << CurrentFnName << " ******\n"; // Emit constant pool for this function - const MachineConstantPool *MCP = MachineFunction::get(&F).getConstantPool(); + const MachineConstantPool *MCP = MF.getConstantPool(); const std::vector &CP = MCP->getConstants(); - enterSection(AsmPrinter::ReadOnlyData); + enterSection(ReadOnlyData); for (unsigned i = 0, e = CP.size(); i != e; ++i) { - std::string cpiName = ".CPI_" + methName + "_" + utostr(i); + std::string cpiName = ".CPI_" + CurrentFnName + "_" + utostr(i); printConstant(CP[i], cpiName); } - enterSection(AsmPrinter::Text); - toAsm << "\t.align\t4\n\t.global\t" << methName << "\n"; - //toAsm << "\t.type\t" << methName << ",#function\n"; - toAsm << "\t.type\t" << methName << ", 2\n"; - toAsm << methName << ":\n"; + enterSection(Text); + O << "\t.align\t4\n\t.global\t" << CurrentFnName << "\n"; + //O << "\t.type\t" << CurrentFnName << ",#function\n"; + O << "\t.type\t" << CurrentFnName << ", 2\n"; + O << CurrentFnName << ":\n"; // Output code for all of the basic blocks in the function... - MachineFunction &MF = MachineFunction::get(&F); for (MachineFunction::const_iterator I = MF.begin(), E = MF.end(); I != E;++I) emitBasicBlock(*I); // Output a .size directive so the debugger knows the extents of the function - toAsm << ".EndOf_" << methName << ":\n\t.size " - << methName << ", .EndOf_" - << methName << "-" << methName << "\n"; + O << ".EndOf_" << CurrentFnName << ":\n\t.size " + << CurrentFnName << ", .EndOf_" + << CurrentFnName << "-" << CurrentFnName << "\n"; // Put some spaces between the functions - toAsm << "\n\n"; + O << "\n\n"; } void SparcV9AsmPrinter::printGlobalVariable(const GlobalVariable* GV) { if (GV->hasExternalLinkage()) - toAsm << "\t.global\t" << getID(GV) << "\n"; + O << "\t.global\t" << getID(GV) << "\n"; if (GV->hasInitializer() && ! GV->getInitializer()->isNullValue()) { printConstant(GV->getInitializer(), getID(GV)); } else { - toAsm << "\t.align\t" << TypeToAlignment(GV->getType()->getElementType(), - Target) << "\n"; - toAsm << "\t.type\t" << getID(GV) << ",#object\n"; - toAsm << "\t.reserve\t" << getID(GV) << "," - << findOptimalStorageSize(Target, GV->getType()->getElementType()) - << "\n"; + const Type *ValTy = GV->getType()->getElementType(); + emitAlignment(TM.getTargetData().getTypeAlignmentShift(ValTy)); + O << "\t.type\t" << getID(GV) << ",#object\n"; + O << "\t.reserve\t" << getID(GV) << "," + << TM.getTargetData().getTypeSize(GV->getType()->getElementType()) + << "\n"; } } @@ -782,19 +369,18 @@ if (! GI->isExternal()) { assert(GI->hasInitializer()); if (GI->isConstant()) - enterSection(AsmPrinter::ReadOnlyData); // read-only, initialized data + enterSection(ReadOnlyData); // read-only, initialized data else if (GI->getInitializer()->isNullValue()) - enterSection(AsmPrinter::ZeroInitRWData); // read-write zero data + enterSection(ZeroInitRWData); // read-write zero data else - enterSection(AsmPrinter::InitRWData); // read-write non-zero data + enterSection(InitRWData); // read-write non-zero data printGlobalVariable(GI); } - toAsm << "\n"; + O << "\n"; } -FunctionPass *llvm::createAsmPrinterPass(std::ostream &Out, - const TargetMachine &TM) { +FunctionPass *llvm::createAsmPrinterPass(std::ostream &Out, TargetMachine &TM) { return new SparcV9AsmPrinter(Out, TM); } Index: llvm/lib/Target/SparcV9/SparcV9Internals.h diff -u llvm/lib/Target/SparcV9/SparcV9Internals.h:1.114 llvm/lib/Target/SparcV9/SparcV9Internals.h:1.115 --- llvm/lib/Target/SparcV9/SparcV9Internals.h:1.114 Sun Apr 25 02:04:49 2004 +++ llvm/lib/Target/SparcV9/SparcV9Internals.h Wed Aug 18 00:29:08 2004 @@ -103,7 +103,7 @@ /// Writes out assembly code for the module, one function at a time /// -FunctionPass *createAsmPrinterPass(std::ostream &Out, const TargetMachine &TM); +FunctionPass *createAsmPrinterPass(std::ostream &Out, TargetMachine &TM); /// getPrologEpilogInsertionPass - Inserts prolog/epilog code. /// From lattner at cs.uiuc.edu Wed Aug 18 12:38:48 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed, 18 Aug 2004 12:38:48 -0500 Subject: [llvm-commits] CVS: llvm-www/Developers.html Message-ID: <200408181738.MAA07538@apoc.cs.uiuc.edu> Changes in directory llvm-www: Developers.html added (r1.1) --- Log message: Add an LLVM developers page. I'm just doing the checkin for Reid, who did all of the work, thanks Reid! --- Diffs of the changes: (+71 -0) Index: llvm-www/Developers.html diff -c /dev/null llvm-www/Developers.html:1.1 *** /dev/null Wed Aug 18 12:38:47 2004 --- llvm-www/Developers.html Wed Aug 18 12:38:36 2004 *************** *** 0 **** --- 1,71 ---- + + +

Meet The LLVM Developers

+ +

The developers of LLVM have a variety of backgrounds and interests. This page + provides links to each developer's home page (or LLVM page if they have one). + If you'd like to get a link added to this page, email or contact us!

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Name	Picture
Vikram Adve	+ +
Nate Begeman	+ +
Tanya Brethour	+ +
Misha Brukman	+ +
John Criswell
Brian Gaeke	+ +
Brad Jones	+
Chris Lattner	Sabre
Reid Spencer	+ +

+ + From lattner at cs.uiuc.edu Wed Aug 18 12:41:29 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed, 18 Aug 2004 12:41:29 -0500 Subject: [llvm-commits] CVS: llvm-www/header.incl Message-ID: <200408181741.MAA07565@apoc.cs.uiuc.edu> Changes in directory llvm-www: header.incl updated: 1.25 -> 1.26 --- Log message: Add link to the developer page, get closer to validation --- Diffs of the changes: (+2 -1) Index: llvm-www/header.incl diff -u llvm-www/header.incl:1.25 llvm-www/header.incl:1.26 --- llvm-www/header.incl:1.25 Fri Aug 13 17:40:32 2004 +++ llvm-www/header.incl Wed Aug 18 12:41:18 2004 @@ -11,7 +11,7 @@ The LLVM Compiler Infrastructure

2-7	opcode	opcode	Specifies the opcode of the instruction. Note that the maximum opcode value is 63.
Symbol Table Identifier (0x04)
uint32_vbr	Number of entries in type plane
symtab_entry*	Provides the slot number of the type and its -name.	llist(symtab_entry)	A length list of symbol table entries for + `Type`s +
symtab_plane*	A type plane containing value slot number and -name for all values of the same type.	llist(symtab_plane)	A length list of planes of symbol table + entries for `Value`s

File Types

File Contents

Directory Search

File Names

What Gets Read

LANG ITEMS

PREPROCESSOR ITEMS

TRANSLATOR ITEMS

OPTIMIZER ITEMS

ASSEMBLER ITEMS

LINKER ITEMS

- A -
ADCE