- -LLVM: Frequently Asked Questions - -

Chris Lattner · LLVMGCCDIR

unwind
longjmp
dlopen
@@ -396,13 +409,17 @@
 cannot include special floating point numbers like Not-A-Number or
 Infinity.
@@ -211,6 +195,22 @@
     }
 
unwind
longjmp
-args
bugpoint
-disable-{adce,dce,final-cleanup,simplifycfg}
-disable-{adce,dce,simplifycfg}
bugpoint
-annotated-llvm
-A
--annotated-llvm
-A
--print-all-code
--annotated-llvm
.cshrc
.profile
LLVM_LIB_SEARCH_PATH
LLVMGCCDIR/llvm-gcc/bytecode-libs
LLVM_LIB_SEARCH_PATH
LLVMGCCDIR/bytecode-libs
/llvm-gcc/bin/gcc
/llvm-gcc/bin/g++
/bin/gcc
/bin/g++
PATH
-lc
-lm
LLVM_LIB_SEARCH_PATH
/home/vadve/lattner/local/x86/llvm-gcc/bytecode-libs
.cshrc
.profile
LLVM_LIB_SEARCH_PATH
LLVMGCCDIR/llvm-gcc/bytecode-libs
LLVM_LIB_SEARCH_PATH
LLVMGCCDIR/bytecode-libs
/llvm-gcc/bin/gcc
/llvm-gcc/bin/g++
/bin/gcc
/bin/g++
PATH
-lc
-lm
LLVM_LIB_SEARCH_PATH
/home/vadve/lattner/local/x86/llvm-gcc/bytecode-libs
/localhome
configure
configure
gcc
cc
CC
CXX
configure
PATH
CC
CXX
/localhome
configure
configure
configure
PATH
PATH
PATH
configure
PATH
PATH= ./configure ...
configure
PATH
./config.status <relative path to Makefile>
make
+clean
make
gmake
gmake ENABLE_PROFILING=1
cd llvm/test
gmake  ENABLE_PROFILING=1
configure
gcc
cc
CC
CXX
configure
PATH
CC
CXX
configure
configure
configure
PATH
PATH
PATH
configure
PATH
PATH= ./configure ...
configure
PATH
./config.status <relative path to Makefile>
make
-	clean
make
gmake
gmake ENABLE_PROFILING=1
cd llvm/test
gmake  ENABLE_PROFILING=1
CallInst
InvokeInst
Instruction
CallSite
+
Instruction
CallInst
InvokeInst
operator new
operator
+delete
CVS
llvm/include
llvm/lib
llvm/runtime
llvm/test
llvm/tools
llvm/utils
CVS
llvm/include
llvm/lib
llvm/runtime
llvm/test
llvm/tools
llvm/utils
cd where-you-want-the-C-front-end-to-live
gunzip --stdout cfrontend.platform.tar.gz | tar -xvf
-            -

-            cd cfrontend/sparc

-            ./fixheaders
-            
cd where-you-want-llvm-to-live
gunzip --stdout llvm.tar.gz | tar -xvf -
cd llvm
cd where-you-want-llvm-to-live
cvs -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
cvs -z3 -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm co llvm
cd llvm
configure
--with-llvmgccdir=directory
--enable-spec2000=directory
directory
gmake -k |& tee gnumake.out
-               # this is csh or tcsh syntax
cd where-you-want-the-C-front-end-to-live
gunzip --stdout cfrontend.platform.tar.gz | tar -xvf -
cd cfrontend/sparc

+          ./fixheaders
cd where-you-want-llvm-to-live
gunzip --stdout llvm.tar.gz | tar -xvf -
cd llvm
cd where-you-want-llvm-to-live
cvs -d
+          :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
cvs -z3 -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm 
+          co llvm
cd llvm
configure
--with-llvmgccdir=directory
--enable-spec2000=directory
directory
gmake -k |& tee gnumake.out
+         # this is csh or tcsh syntax
cfrontend/platform/llvm-gcc
.cshrc
.profile
LLVM_LIB_SEARCH_PATH
LLVMGCCDIR/bytecode-libs
/bin/gcc
/bin/g++
PATH
cd where-you-want-llvm-to-live
cvs -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
cvs -z3 -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm co llvm
llvm
cd where-you-want-the-front-end-to-live
gunzip --stdout cfrontend.platform.tar.gz | tar -xvf
-        -

-    cd cfrontend/sparc
-    

-    ./fixheaders
-    
configure
llvm/Makefile.config
llvm/include/Config/config.h
configure
configure
configure
PATH
configure
configure
configure
PATH
configure
directory
configure
directory
directory
configure
/home/vadve/shared/benchmarks/speccpu2000/benchspec
cd OBJ_ROOT
configure
SRC_ROOT/configure
configure
LLVM_LIB_SEARCH_PATH
-lc
-lm
LLVM_LIB_SEARCH_PATH
/home/vadve/lattner/local/x86/llvm-gcc/bytecode-libs
gmake
--enable-optimized
--enable-optimized
configure
ENABLE_OPTIMIZED=1
gmake
gprof
ENABLE_PROFILING=1
gmake
gmake
gmake -j2
cfrontend/platform/llvm-gcc
gmake clean
gmake distclean
gmake clean
configure
gmake install
configure
gmake ENABLE_OPTIMIZED=1
gmake ENABLE_PROFILING=1
gmake VERBOSE=1
gmake
Makefile
gmake
.cshrc
.profile
LLVM_LIB_SEARCH_PATH
LLVMGCCDIR/bytecode-libs
cd OBJ_ROOT
configure
SRC_ROOT/configure
/bin/gcc
/bin/g++
PATH
cd where-you-want-llvm-to-live
cvs -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm login
cvs -z3 -d :pserver:anon at llvm-cvs.cs.uiuc.edu:/var/cvs/llvm co
+      llvm
llvm
cd where-you-want-the-front-end-to-live
gunzip --stdout cfrontend.platform.tar.gz | tar -xvf
+      -
cd cfrontend/sparc

+   ./fixheaders
configure
llvm/Makefile.config
llvm/include/Config/config.h
configure
configure
configure
PATH
configure
configure
configure
PATH
configure
directory
configure
directory
directory
configure
/home/vadve/shared/benchmarks/speccpu2000/benchspec
cd OBJ_ROOT
OBJ_ROOT/tools/Debug
OBJ_ROOT/lib/Debug
OBJ_ROOT/tools/Release
OBJ_ROOT/lib/Release
OBJ_ROOT/tools/Profile
OBJ_ROOT/lib/Profile
configure
SRC_ROOT/configure
http://llvm.cs.uiuc.edu/doxygen/
CVS
CVS
llvm/include
configure
LLVM_LIB_SEARCH_PATH
-lc
-lm
LLVM_LIB_SEARCH_PATH
/home/vadve/lattner/local/x86/llvm-gcc/bytecode-libs
llvm/include/llvm
Analysis
CodeGen
Target
Transforms
llvm/include/Support
llvm/include/Config
configure
configure
llvm/lib
llvm/lib/VMCore/
llvm/lib/AsmParser/
llvm/lib/ByteCode/
llvm/lib/CWriter/
llvm/lib/Analysis/
llvm/lib/Transforms/
llvm/lib/Target/
llvm/lib/CodeGen/
llvm/lib/Support/
llvm/include/Support/
llvm/runtime
gmake
--enable-optimized
llvm/test
llvm/tools
tool_name --help
analyze
analyze
bugpoint
bugpoint
bugpoint
llvm-ar
llvm-as
llvm-dis
-c
--enable-optimized
configure
ENABLE_OPTIMIZED=1
gmake
llvm-link
llvm-link
lli
lli
lli
-trace
lli
llc
llc
llvmgcc
llvmgcc
-c, -S, -E,
-      -o
llvmgcc
gccas
llvmgcc
llvmgcc -c x.c -o x.o
gccas
x.o
gccas
as
gccld
gccld
gccas
gccld
opt
opt
opt --help
llvm/utils
Burg/
Burg
codegen-diff
codegen-diff
`perldoc codegen-diff'
cvsupdate
cvsupdate
`cvs -z3 up -dP'
utils/cvsupdate
emacs/
emacs
README
getsrcs.sh
getsrcs.sh
xemacs `utils/getsources.sh`
makellvm
makellvm
llvm/lib/Target/Sparc
makellvm
makellvm llc
llvm/tools/llc
NightlyTest.pl
NightlyTestTemplate.html
TableGen/
TableGen
vim/
vim
README
gprof
ENABLE_PROFILING=1
gmake
gmake
gmake -j2
gmake clean
gmake distclean
gmake clean
configure
gmake install
configure
gmake ENABLE_OPTIMIZED=1
gmake ENABLE_PROFILING=1
gmake VERBOSE=1
gmake
Makefile
gmake
cd OBJ_ROOT
configure
SRC_ROOT/configure
OBJ_ROOT/tools/Debug
OBJ_ROOT/lib/Debug
OBJ_ROOT/tools/Release
OBJ_ROOT/lib/Release
OBJ_ROOT/tools/Profile
OBJ_ROOT/lib/Profile
http://llvm.cs.uiuc.edu/doxygen/
CVS
CVS
llvm/include
llvm/include/llvm
Analysis
CodeGen
Target
Transforms
llvm/include/Support
llvm/include/Config
configure
configure
llvm/lib
llvm/lib/VMCore/
llvm/lib/AsmParser/
llvm/lib/ByteCode/
llvm/lib/CWriter/
llvm/lib/Analysis/
llvm/lib/Transforms/
llvm/lib/Target/
llvm/lib/CodeGen/
llvm/lib/Support/
llvm/include/Support/
llvm/runtime
llvm/test
llvm/tools
tool_name --help
analyze
analyze
bugpoint
bugpoint
bugpoint
llvm-ar
llvm-as
llvm-dis
-c
llvm-link
llvm-link
lli
lli
lli
-trace
lli
llc
llc
llvmgcc
llvmgcc
-c, -S, -E,
+  -o
llvmgcc
gccas
llvmgcc
llvmgcc -c x.c -o x.o
gccas
x.o
gccas
as
gccld
gccld
gccas
gccld
opt
opt
opt --help
llvm/utils
Burg/
Burg
codegen-diff
codegen-diff
`perldoc codegen-diff'
cvsupdate
cvsupdate
`cvs -z3 up -dP'
utils/cvsupdate
emacs/
emacs
README
getsrcs.sh
getsrcs.sh
xemacs `utils/getsources.sh`
makellvm
makellvm
llvm/lib/Target/Sparc
makellvm
makellvm llc
llvm/tools/llc
NightlyTest.pl
NightlyTestTemplate.html
TableGen/
TableGen
vim/
vim
README
    #include <stdio.h>
    int main() {
      printf("hello world\n");
      return 0;
    }
-       
% llvmgcc hello.c -o hello
% llvmgcc hello.c -o hello
hello
hello
hello.bc
hello.bc
hello
lli
lli
% ./hello
% ./hello
% lli hello.bc
% lli hello.bc
llvm-dis
llvm-dis
% llvm-dis < hello.bc | less
% llvm-dis < hello.bc | less
% llc hello.bc -o hello.s
% llc hello.bc -o hello.s
% /opt/SUNWspro/bin/cc -xarch=v9 hello.s -o hello.sparc
% /opt/SUNWspro/bin/cc -xarch=v9 hello.s -o hello.sparc
% ./hello.sparc
% ./hello.sparc
vaarg
ret
br
switch
invoke
unwind
ret
br
switch
invoke
unwind
add
sub
mul
div
rem
setcc
add
sub
mul
div
rem
setcc
and
or
xor
shl
shr
and
or
xor
shl
shr
malloc
free
alloca
load
store
getelementptr
malloc
free
alloca
load
store
getelementptr
phi
cast .. to
call
vanext
vaarg
phi
cast .. to
call
vanext
vaarg
llvm.va_start
llvm.va_end
llvm.va_copy
llvm.va_start
llvm.va_end
llvm.va_copy
   %x = add int 1, %x
 
%x
%x
%[a-zA-Z$._][a-zA-Z$._0-9]*
"
%[a-zA-Z$._][a-zA-Z$._0-9]*
"
add
cast
ret
void
uint
%X
%X
   %result = mul uint %X, 8
 
   %result = shl uint %X, ubyte 3
 
   add uint %X, %X           ; yields {uint}:%0
   add uint %0, %0           ; yields {uint}:%1
   %result = add uint %1, %1
 
%X
%X
;
;
double
+The one non-intuitive notation for constants is the optional hexidecimal form
+of floating point constants.  For example, the form 'double
 0x432ff973cafa8000' is equivalent to (but harder to read than) 'double
 4.5e+15' which is also supported by the parser.  The only time hexadecimal
 floating point constants are useful (and the only time that they are generated
@@ -238,41 +260,47 @@
 representable as a decimal floating point number exactly.  For example, NaN's,
 infinities, and other special cases are represented in their IEEE hexadecimal
 format so that assembly and disassembly do not cause any bits to change in the
-constants.

+constants.
 
+

 
 
-

-

+
+  Type System
+
 
 
-The LLVM type system is one of the most important features of the intermediate
-representation.  Being typed enables a number of optimizations to be performed
-on the IR directly, without having to do extra analyses on the side before the
-transformation.  A strong type system makes it easier to read the generated code
-and enables novel analyses and transformations that are not feasible to perform
-on normal three address code representations.
+

+
+The LLVM type system is one of the most important features of the
+intermediate representation.  Being typed enables a number of optimizations to
+be performed on the IR directly, without having to do extra analyses on the side
+before the transformation.  A strong type system makes it easier to read the
+generated code and enables novel analyses and transformations that are not
+feasible to perform on normal three address code representations.
 
 
 
-
+
 
 
-

-

+
+  Primitive Types
+
 
-The primitive types are the fundemental building blocks of the LLVM system.  The
-current set of primitive types are as follows:
+

 
-
+The primitive types are the fundemental building blocks of the LLVM system.
+The current set of primitive types are as follows:
+
+
+
+
+
+
+
 
-
+
@@ -284,7 +312,7 @@
 
 
 void   No value
 ubyte  Unsigned 8 bit value
 ushort Unsigned 16 bit value

 
-
+
@@ -293,161 +321,234 @@
 
 bool   True or False value
 sbyte  Signed 8 bit value
 short  Signed 16 bit value
double 64 bit floating point value
 
 
-

-
+
+
 
+
 
 
-
Type Classifications
+
+  Type Classifications
+
+
+
 
-These different primitive types fall into a few useful classifications:
+
These different primitive types fall into a few useful classifications:
 
-
-
-
-
-
-
-
-signed     sbyte, short, int, long, float, double
unsigned ubyte, ushort, uint, ulong
integer ubyte, sbyte, ushort, short, uint, int, ulong, long
integral bool, ubyte, sbyte, ushort, short, uint, int, ulong, long
floating point float, double
first class bool, ubyte, sbyte, ushort, short,
 uint, int, ulong, long, float, double, pointer

+

+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+signed sbyte, short, int, long, float, double
unsigned ubyte, ushort, uint, ulong
integer ubyte, sbyte, ushort, short, uint, int, ulong, long
integral bool, ubyte, sbyte, ushort, short, uint, int, ulong, long
floating point float, double
first class bool, ubyte, sbyte, ushort, short,

+          uint, int, ulong, long, float, double,
+          pointer
+
 
-The first class types are perhaps the most
+The first class types are perhaps the most
 important.  Values of these types are the only ones which can be produced by
 instructions, passed as arguments, or used as operands to instructions.  This
 means that all structures and arrays must be manipulated either by pointer or by
-component.

+component.
 
+
 
 
-
    
-Derived Types
-

+
+  Derived Types
+
 
-The real power in LLVM comes from the derived types in the system.  This is what
-allows a programmer to represent arrays, functions, pointers, and other useful
-types.  Note that these derived types may be recursive: For example, it is
-possible to have a two dimensional array.
+

 
+The real power in LLVM comes from the derived types in the system.  This is
+what allows a programmer to represent arrays, functions, pointers, and other
+useful types.  Note that these derived types may be recursive: For example, it
+is possible to have a two dimensional array.
 
+
 
 
-
Array Type
+
+  Array Type
+
+
+
 
 Overview:
 
-The array type is a very simple derived type that arranges elements sequentially
-in memory.  The array type requires a size (number of elements) and an
-underlying data type.
+
The array type is a very simple derived type that arranges elements
+sequentially in memory.  The array type requires a size (number of elements) and
+an underlying data type.
 
 Syntax:
+
    [<# elements> x <elementtype>]
 
 
-The number of elements is a constant integer value, elementtype may be any type
-with a size.
+
The number of elements is a constant integer value, elementtype may be any
+type with a size.
 
 Examples:
-
+
+
    [40 x int ]: Array of 40 integer values.

    [41 x int ]: Array of 41 integer values.

    [40 x uint]: Array of 40 unsigned integer values.

-
+
+
+Here are some examples of multidimensional arrays:
 
-Here are some examples of multidimensional arrays:
-

-
-
-
-
+
+
[3 x [4 x int]] : 3x4 array integer values.
[12 x [10 x float]] : 12x10 array of single precision floating point values.
[2 x [3 x [4 x uint]]] : 2x3x4 array of unsigned integer values.
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+[3 x [4 x int]] : 3x4 array integer values.
[12 x [10 x float]] : 12x10 array of single precision floating point values.
[2 x [3 x [4 x uint]]] : 2x3x4 array of unsigned integer values.
 
-
+
 
+
 
 
-
Function Type
+
+  Function Type
+
+
+
 
 Overview:
 
-The function type can be thought of as a function signature.  It consists of a
-return type and a list of formal parameter types.  Function types are usually
+The function type can be thought of as a function signature.  It consists of
+a return type and a list of formal parameter types.  Function types are usually
 used when to build virtual function tables (which are structures of pointers to
-functions), for indirect function calls, and when defining a function.

+functions), for indirect function calls, and when defining a function.
 
 Syntax:
+
    <returntype> (<parameter list>)
 
 
-Where '<parameter list>' is a comma-separated list of type
+Where '<parameter list>' is a comma-separated list of type
 specifiers.  Optionally, the parameter list may include a type ...,
 which indicates that the function takes a variable number of arguments.
 Variable argument functions can access their arguments with the variable argument handling intrinsic functions.
-

+href="#int_varargs">variable argument handling intrinsic functions.
 
 Examples:
-
-
 
-
-
-
-
-
+
+
int (int) : function taking an int, returning
-an int
float (int, int *) * : Pointer
-to a function that takes an int and a pointer
-to int, returning float.
int (sbyte *, ...) : A vararg function that takes at
-least one pointer to sbyte (signed char in C),
-which returns an integer.  This is the signature for printf in
-LLVM.
 
+
+  
+  
+
+
+   
+  
+
+
+  
+  
+int (int) : function taking an int, returning an int
float (int, int *) * : Pointer to a function that takes an
+      int and a pointer to int,
+      returning float.
int (sbyte *, ...) : A vararg function that takes at least one pointer to sbyte (signed char in C), which
+      returns an integer.  This is the signature for printf in
+      LLVM.
 
-
-
+
 
+
 
 
-
Structure Type
+
+  Structure Type
+
+
+
 
 Overview:
 
-The structure type is used to represent a collection of data members together in
-memory.  The packing of the field types is defined to match the ABI of the
+The structure type is used to represent a collection of data members together
+in memory.  The packing of the field types is defined to match the ABI of the
 underlying processor.  The elements of a structure may be any type that has a
-size.

+size.
 
-Structures are accessed using 'load and 'store' by getting a pointer to a field with the 'getelementptr' instruction.
+
Structures are accessed using 'load and
+'store' by getting a pointer to a field with the
+'getelementptr' instruction.
 
 Syntax:
+
    { <type list> }
 
 
-
 Examples:
-
-
-
-
-
 
+
+
{ int, int, int } : a triple of three int
-values
{ float, int (int) * } : A pair, where the first
-element is a float and the second element is a pointer to a function that takes
-an int, returning an int.
+
+  
+  
+
+
+  
+  
+{ int, int, int } : a triple of three int values
{ float, int (int) * } : A pair, where the first element is a float and the second
+      element is a pointer to a function that takes an int, returning an
+      int.
 
+
 
+
 
 
-
Pointer Type
+
+  Pointer Type
+
+
+
 
 Overview:
 
-As in many languages, the pointer type represents a pointer or reference to
-another object, which must live in memory.
+
As in many languages, the pointer type represents a pointer or reference to
+another object, which must live in memory.
 
 Syntax:
 @@ -456,49 +557,61 @@
 
 Examples:
 
-
-
-
-
-
-
-[4x int]* : pointer to array of four int values
int (int *) * : A pointer to a
-function that takes an int, returning an
-int.
 
+
+
+  
+  
+
+
+  
+  
+
+[4x int]* : pointer to array of four
+      int values
int (int *) * : A pointer to a function that takes an int, returning an
+      int.
+
 
+
 
 
 
 
 
 
-
-
-High Level Structure
-

+
+  High Level Structure
+
 
 
 
 
-
-    
-Module Structure
-

+
+  Module Structure
+
 
-LLVM programs are composed of "Module"s, each of which is a translation unit of
-the input programs.  Each module consists of functions, global variables, and
+
+
+LLVM programs are composed of "Module"s, each of which is a translation unit
+of the input programs.  Each module consists of functions, global variables, and
 symbol table entries.  Modules may be combined together with the LLVM linker,
 which merges function (and global variable) definitions, resolves forward
-declarations, and merges symbol table entries. Here is an example of the "hello world" module:

+declarations, and merges symbol table entries. Here is an example of the "hello
+world" module:
 
  ; Declare the string constant as a global constant...
@@ -518,9 +631,9 @@
 }
 
 
-This example is made up of a global variable named
+This example is made up of a global variable named
 ".LC0", an external declaration of the "puts" function, and a
-function definition for "main".

+function definition for "main".
 
 
 In general, a module is made up of a list of global values, where both functions
@@ -573,94 +686,105 @@
 
 
 
-
-For example, since the ".LC0" variable is defined to be internal, if
+
For example, since the ".LC0" variable is defined to be internal, if
 another module defined a ".LC0" variable and was linked with this one,
 one of the two would be renamed, preventing a collision.  Since "main"
 and "puts" are external (i.e., lacking any linkage declarations), they
 are accessible outside of the current module.  It is illegal for a function
-declaration to have any linkage type other than "externally visible".

+declaration to have any linkage type other than "externally visible".
 
+

 
 
-

-    
-Global Variables
-

-
-Global variables define regions of memory allocated at compilation time instead
-of run-time.  Global variables may optionally be initialized.  A variable may
-be defined as a global "constant", which indicates that the contents of the
-variable will never be modified (opening options for optimization).  Constants
-must always have an initial value.
+
+  Global Variables
+
+
+
+
+Global variables define regions of memory allocated at compilation time
+instead of run-time.  Global variables may optionally be initialized.  A
+variable may be defined as a global "constant", which indicates that the
+contents of the variable will never be modified (opening options for
+optimization).  Constants must always have an initial value.
 
-As SSA values, global variables define pointer values that are in scope
+As SSA values, global variables define pointer values that are in scope
 (i.e. they dominate) for all basic blocks in the program.  Global variables
 always define a pointer to their "content" type because they describe a region
-of memory, and all memory objects in LLVM are accessed through pointers.

-
+of memory, and all memory objects in LLVM are accessed through pointers.
 
+
 
 
-
-    
-Functions
-

+
+  Functions
+
+
+
 
-LLVM functions definitions are composed of a (possibly empty) argument list, an
-opening curly brace, a list of basic blocks, and a closing curly brace.  LLVM
+LLVM functions definitions are composed of a (possibly empty) argument list,
+an opening curly brace, a list of basic blocks, and a closing curly brace.  LLVM
 function declarations are defined with the "declare" keyword, a
-function name and a function signature.

+function name and a function signature.
 
-A function definition contains a list of basic blocks, forming the CFG for the
-function.  Each basic block may optionally start with a label (giving the basic
-block a symbol table entry), contains a list of instructions, and ends with a terminator instruction (such as a branch or function
-return).
+
A function definition contains a list of basic blocks, forming the CFG for
+the function.  Each basic block may optionally start with a label (giving the
+basic block a symbol table entry), contains a list of instructions, and ends
+with a terminator instruction (such as a branch or
+function return).
 
-The first basic block in program is special in two ways: it is immediately
+The first basic block in program is special in two ways: it is immediately
 executed on entrance to the function, and it is not allowed to have predecessor
 basic blocks (i.e. there can not be any branches to the entry block of a
 function).  Because the block can have no predecessors, it also cannot have any
-PHI nodes.

+PHI nodes.
 
+
 
 
-
-
-Instruction Reference
-

+
+  Instruction Reference
+
 
 
-The LLVM instruction set consists of several different classifications of
+
+
+The LLVM instruction set consists of several different classifications of
 instructions: terminator instructions, binary instructions, memory
-instructions, and other instructions.

+instructions, and other instructions.
 
+
 
 
-
-    
-Terminator Instructions
-

-
-As mentioned previously, every basic block in a
-program ends with a "Terminator" instruction, which indicates which block should
-be executed after the current block is finished. These terminator instructions
-typically yield a 'void' value: they produce control flow, not values
-(the one exception being the 'invoke'
-instruction).
+

+  Terminator Instructions
+
+
+
+
+As mentioned previously, every basic block
+in a program ends with a "Terminator" instruction, which indicates which block
+should be executed after the current block is finished. These terminator
+instructions typically yield a 'void' value: they produce control flow,
+not values (the one exception being the 'invoke' instruction).
 
-There are five different terminator instructions: the 'There are five different terminator instructions: the 'ret' instruction, the 'br' instruction, the 'switch' instruction, the 'invoke' instruction, and the 'unwind' instruction.
+href="#i_unwind">unwind' instruction.
 
+
 
 
-
'ret' Instruction
+
+  'ret' Instruction
+
+
+
 
 Syntax:
 @@ -670,30 +794,29 @@
 
 Overview:
 
-The 'ret' instruction is used to return control flow (and a value) from
-a function, back to the caller.
+
The 'ret' instruction is used to return control flow (and a value)
+from a function, back to the caller.
 
-There are two forms of the 'ret' instructruction: one that returns a
+There are two forms of the 'ret' instructruction: one that returns a
 value and then causes control flow, and one that just causes control flow to
-occur.

+occur.
 
 Arguments:
 
-The 'ret' instruction may return any 'first
+The 'ret' instruction may return any 'first
 class' type.  Notice that a function is not well
 formed if there exists a 'ret' instruction inside of the function
-that returns a value that does not match the return type of the function.

+that returns a value that does not match the return type of the function.
 
 Semantics:
 
-When the 'ret' instruction is executed, control flow returns back to
+When the 'ret' instruction is executed, control flow returns back to
 the calling function's context.  If the caller is a "call instruction, execution continues at the
 instruction after the call.  If the caller was an "invoke" instruction, execution continues at the
 beginning "normal" of the destination block.  If the instruction returns a
-value, that value shall set the call or invoke instruction's return value.

-
+value, that value shall set the call or invoke instruction's return value.
 
 Example:
 @@ -701,11 +824,17 @@
   ret void                        ; Return from a void function
 
 
+
 
 
-
'br' Instruction
+
+  'br' Instruction
+
+
+
 
 Syntax:
+
    br bool <cond>, label <iftrue>, label <iffalse>
   br label <dest>          ; Unconditional branch
@@ -713,26 +842,28 @@
 
 Overview:
 
-The 'br' instruction is used to cause control flow to transfer to a
+The 'br' instruction is used to cause control flow to transfer to a
 different basic block in the current function.  There are two forms of this
 instruction, corresponding to a conditional branch and an unconditional
-branch.

+branch.
 
 Arguments:
 
-The conditional branch form of the 'br' instruction takes a single
+The conditional branch form of the 'br' instruction takes a single
 'bool' value and two 'label' values.  The unconditional form
 of the 'br' instruction takes a single 'label' value as a
-target.

+target.
 
 Semantics:
 
-Upon execution of a conditional 'br' instruction, the 'bool'
-argument is evaluated.  If the value is true, control flows to the
-'iftrue' label argument.  If "cond" is false,
-control flows to the 'iffalse' label argument.
+
Upon execution of a conditional 'br' instruction, the
+'bool' argument is evaluated.  If the value is true, control
+flows to the 'iftrue' label argument.  If "cond" is
+false, control flows to the 'iffalse' label
+argument.
 
 Example:
+
  Test:
   %cond = seteq int %a, %b
@@ -743,42 +874,49 @@
   ret int 0
 
 
+
 
 
-
'switch' Instruction
+
+  'switch' Instruction
+
+
+
 
 Syntax:
+
    switch uint <value>, label <defaultdest> [ int <val>, label &dest>, ... ]
-
 
 
 Overview:
 
-The 'switch' instruction is used to transfer control flow to one of
+The 'switch' instruction is used to transfer control flow to one of
 several different places.  It is a generalization of the 'br'
-instruction, allowing a branch to occur to one of many possible destinations.

+instruction, allowing a branch to occur to one of many possible
+destinations.
 
 Arguments:
 
-The 'switch' instruction uses three parameters: a 'uint'
+The 'switch' instruction uses three parameters: a 'uint'
 comparison value 'value', a default 'label' destination, and
-an array of pairs of comparison value constants and 'label's.

+an array of pairs of comparison value constants and 'label's.
 
 Semantics:
 
-The switch instruction specifies a table of values and destinations.
+The switch instruction specifies a table of values and destinations.
 When the 'switch' instruction is executed, this table is searched for
 the given value.  If the value is found, the corresponding destination is
-branched to, otherwise the default value it transfered to.

+branched to, otherwise the default value it transfered to.
 
 Implementation:
 
-Depending on properties of the target machine and the particular switch
-instruction, this instruction may be code generated as a series of chained
-conditional branches, or with a lookup table.
+
Depending on properties of the target machine and the particular
+switch instruction, this instruction may be code generated as a series
+of chained conditional branches, or with a lookup table.
 
 Example:
+
    ; Emulate a conditional br instruction
   %Val = cast bool %value to uint
@@ -793,12 +931,17 @@
                                        int 2, label %ontwo ]
 
 
-
+
 
 
-
'invoke' Instruction
+
+  'invoke' Instruction
+
+
+
 
 Syntax:
+
    <result> = invoke <ptr to function ty> %<function ptr val>(<function args>)
                  to label <normal label> except label <exception label>
@@ -806,19 +949,19 @@
 
 Overview:
 
-The 'invoke' instruction causes control to transfer to a specified
+The 'invoke' instruction causes control to transfer to a specified
 function, with the possibility of control flow transfer to either the
 'normal' label label or the 'exception'
 label.  If the callee function returns with the "ret" instruction, control flow will return to the
 "normal" label.  If the callee (or any indirect callees) returns with the "unwind" instruction, control is interrupted, and
-continued at the dynamically nearest "except" label.

-
+continued at the dynamically nearest "except" label.
 
 Arguments:
 
-This instruction requires several arguments:
+
This instruction requires several arguments:
+
 
 
 'ptr to function ty': shall be the signature of the pointer to
@@ -842,207 +985,274 @@
 
 Semantics:
 
-This instruction is designed to operate as a standard 'This instruction is designed to operate as a standard 'call' instruction in most regards.  The primary
-difference is that it establishes an association with a label, which is used by the runtime library to unwind the stack.
+difference is that it establishes an association with a label, which is used by the runtime library to unwind the stack.
 
-This instruction is used in languages with destructors to ensure that proper
+This instruction is used in languages with destructors to ensure that proper
 cleanup is performed in the case of either a longjmp or a thrown
 exception.  Additionally, this is important for implementation of
-'catch' clauses in high-level languages that support them.

+'catch' clauses in high-level languages that support them.
 
 Example:
+
    %retval = invoke int %Test(int 15)
               to label %Continue
               except label %TestCleanup     ; {int}:retval set
 
 
+

+
 
-
'unwind' Instruction
+
+  'unwind' Instruction
+
+
+
 
 Syntax:
+
    unwind
 
 
 Overview:
 
-The 'unwind' instruction unwinds the stack, continuing control flow at
-the first callee in the dynamic call stack which used an The 'unwind' instruction unwinds the stack, continuing control flow
+at the first callee in the dynamic call stack which used an invoke instruction to perform the call.  This is
-primarily used to implement exception handling.
+primarily used to implement exception handling.
 
 Semantics:
 
-The 'unwind' intrinsic causes execution of the current function to
+The 'unwind' intrinsic causes execution of the current function to
 immediately halt.  The dynamic call stack is then searched for the first invoke instruction on the call stack.  Once found,
 execution continues at the "exceptional" destination block specified by the
 invoke instruction.  If there is no invoke instruction in the
-dynamic call chain, undefined behavior results.
-
+dynamic call chain, undefined behavior results.
 
+
 
 
-
    
-Binary Operations
-

+
+  Binary Operations
+
 
-Binary operators are used to do most of the computation in a program.  They
+
+
+Binary operators are used to do most of the computation in a program.  They
 require two operands, execute an operation on them, and produce a single value.
 The result value of a binary operator is not necessarily the same type as its
-operands.

+operands.
 
-There are several different binary operators:
+
There are several different binary operators:
 
+
 
 
-
'add' Instruction
+
+  'add' Instruction
+
+
+
 
 Syntax:
+
    <result> = add <ty> <var1>, <var2>   ; yields {ty}:result
 
 
 Overview:
-The 'add' instruction returns the sum of its two operands.
+
+
The 'add' instruction returns the sum of its two operands.
 
 Arguments:
-The two arguments to the 'add' instruction must be either integer or floating point values.  Both arguments must have identical types.
+
+
The two arguments to the 'add' instruction must be either integer or floating point
+values.  Both arguments must have identical types.
 
 Semantics:
 
-The value produced is the integer or floating point sum of the two operands.
+
The value produced is the integer or floating point sum of the two
+operands.
 
 Example:
+
    <result> = add int 4, %var          ; yields {int}:result = 4 + %var
 
 
+
 
 
-
'sub' Instruction
+
+  'sub' Instruction
+
+
+
 
 Syntax:
+
    <result> = sub <ty> <var1>, <var2>   ; yields {ty}:result
 
 
 Overview:
 
-The 'sub' instruction returns the difference of its two operands.
+
The 'sub' instruction returns the difference of its two
+operands.
 
-Note that the 'sub' instruction is used to represent the 'neg'
-instruction present in most other intermediate representations.
+
Note that the 'sub' instruction is used to represent the
+'neg' instruction present in most other intermediate
+representations.
 
 Arguments:
 
-The two arguments to the 'sub' instruction must be either The two arguments to the 'sub' instruction must be either integer or floating point
-values.  Both arguments must have identical types.
+values.  Both arguments must have identical types.
 
 Semantics:
 
-The value produced is the integer or floating point difference of the two
-operands.
+
The value produced is the integer or floating point difference of the two
+operands.
 
 Example:
+
    <result> = sub int 4, %var          ; yields {int}:result = 4 - %var
   <result> = sub int 0, %val          ; yields {int}:result = -%var
 
 
+
+
 
-
'mul' Instruction
+
+  'mul' Instruction
+
+
+
 
 Syntax:
+
    <result> = mul <ty> <var1>, <var2>   ; yields {ty}:result
 
 
 Overview:
-The  'mul' instruction returns the product of its two operands.
+
+
The  'mul' instruction returns the product of its two operands.
 
 Arguments:
-The two arguments to the 'mul' instruction must be either integer or floating point values.  Both arguments must have identical types.
 
-
Semantics:
+The two arguments to the 'mul' instruction must be either integer or floating point
+values.  Both arguments must have identical types.
 
-The value produced is the integer or floating point product of the two
-operands.
+
Semantics:
 
-There is no signed vs unsigned multiplication.  The appropriate action is taken
-based on the type of the operand. 
+
The value produced is the integer or floating point product of the two
+operands.
 
+There is no signed vs unsigned multiplication.  The appropriate action is
+taken based on the type of the operand.
 
 Example:
+
    <result> = mul int 4, %var          ; yields {int}:result = 4 * %var
 
 
+
 
 
-
'div' Instruction
+
+  'div' Instruction
+
+
+
 
 Syntax:
+
    <result> = div <ty> <var1>, <var2>   ; yields {ty}:result
 
 
 Overview:
 
-The  'div' instruction returns the quotient of its two operands.
+
The 'div' instruction returns the quotient of its two operands.
 
 Arguments:
 
-The two arguments to the 'div' instruction must be either The two arguments to the 'div' instruction must be either integer or floating point
-values.  Both arguments must have identical types.
+values.  Both arguments must have identical types.
 
 Semantics:
 
-The value produced is the integer or floating point quotient of the two
-operands.
+
The value produced is the integer or floating point quotient of the two
+operands.
 
 Example:
+
    <result> = div int 4, %var          ; yields {int}:result = 4 / %var
 
 
+
 
 
-
'rem' Instruction
+
+  'rem' Instruction
+
+
+
 
 Syntax:
+
    <result> = rem <ty> <var1>, <var2>   ; yields {ty}:result
 
 
 Overview:
-The  'rem' instruction returns the remainder from the division of its two operands.
+
+
The 'rem' instruction returns the remainder from the division of its
+two operands.
 
 Arguments:
-The two arguments to the 'rem' instruction must be either integer or floating point values.  Both arguments must have identical types.
+
+
The two arguments to the 'rem' instruction must be either integer or floating point
+values.  Both arguments must have identical types.
 
 Semantics:
 
-This returns the remainder of a division (where the result has the same
-sign as the divisor), not the modulus (where the result has the same sign
-as the dividend) of a value.  For more information about the difference, see: The Math
-Forum.
+
This returns the remainder of a division (where the result has the
+same sign as the divisor), not the modulus (where the result has the same
+sign as the dividend) of a value.  For more information about the difference,
+see: The Math
+Forum.
 
 Example:
+
    <result> = rem int 4, %var          ; yields {int}:result = 4 % %var
 
 
+
 
 
-
'setcc' Instructions
+
+  'setcc' Instructions
+
+
+
 
 Syntax:
+
    <result> = seteq <ty> <var1>, <var2>   ; yields {bool}:result
   <result> = setne <ty> <var1>, <var2>   ; yields {bool}:result
@@ -1052,19 +1262,22 @@
   <result> = setge <ty> <var1>, <var2>   ; yields {bool}:result
 
 
-Overview:
 The 'setcc' family of instructions returns a
-boolean value based on a comparison of their two operands.
+
Overview: 
+
+The 'setcc' family of instructions returns a boolean value
+based on a comparison of their two operands.
 
-Arguments:
 The two arguments to the 'setcc'
-instructions must be of first class type (it is not
-possible to compare 'label's, 'array's, 'structure'
-or 'void' values, etc...).  Both arguments must have identical
-types.
+
Arguments: 
+
+The two arguments to the 'setcc' instructions must be of first class type (it is not possible to compare
+'label's, 'array's, 'structure' or 'void'
+values, etc...).  Both arguments must have identical types.
 
 Semantics:
 
-The 'seteq' instruction yields a true 'bool' value if
-both operands are equal.

+The 'seteq' instruction yields a true 'bool' value
+if both operands are equal.

 
 The 'setne' instruction yields a true 'bool' value if
 both operands are unequal.

@@ -1079,9 +1292,10 @@
 the first operand is less than or equal to the second operand.

 
 The 'setge' instruction yields a true 'bool' value if
-the first operand is greater than or equal to the second operand.

+the first operand is greater than or equal to the second operand.
 
 Example:
+
    <result> = seteq int   4, 5        ; yields {bool}:result = false
   <result> = setne float 4, 5        ; yields {bool}:result = true
@@ -1091,134 +1305,161 @@
   <result> = setge sbyte 4, 5        ; yields {bool}:result = false
 
 
-
+
 
 
-
-    
-Bitwise Binary Operations
-

+
+  Bitwise Binary Operations
+
+
+
 
-Bitwise binary operators are used to do various forms of bit-twiddling in a
+Bitwise binary operators are used to do various forms of bit-twiddling in a
 program.  They are generally very efficient instructions, and can commonly be
 strength reduced from other instructions.  They require two operands, execute an
 operation on them, and produce a single value.  The resulting value of the
-bitwise binary operators is always the same type as its first operand.

+bitwise binary operators is always the same type as its first operand.
+
+
 
 
-
'and' Instruction
+
+  'and' Instruction
+
+
+
 
 Syntax:
+
    <result> = and <ty> <var1>, <var2>   ; yields {ty}:result
 
 
 Overview:
-The 'and' instruction returns the bitwise logical and of its two operands.
+
+
The 'and' instruction returns the bitwise logical and of its two
+operands.
 
 Arguments:
 
-The two arguments to the 'and' instruction must be The two arguments to the 'and' instruction must be integral values.  Both arguments must have identical
-types.
-
+types.
 
 Semantics:
 
-The truth table used for the 'and' instruction is:
+
The truth table used for the 'and' instruction is:
 
-
+
+

+
-
 In0   In1   Out
 0   0   0
 0   1   0
 1   0   0
 1   1   1
-
+
+
 
 Example:
+
    <result> = and int 4, %var         ; yields {int}:result = 4 & %var
   <result> = and int 15, 40          ; yields {int}:result = 8
   <result> = and int 4, 8            ; yields {int}:result = 0
 
 
-
+
 
 
-

'or' Instruction
+
+  'or' Instruction
+
+
+
 
 Syntax:
+
    <result> = or <ty> <var1>, <var2>   ; yields {ty}:result
 
 
-Overview:
 The 'or' instruction returns the bitwise logical
-inclusive or of its two operands.
+
Overview: 
+
+The 'or' instruction returns the bitwise logical inclusive or of its
+two operands.
 
 Arguments:
 
-The two arguments to the 'or' instruction must be The two arguments to the 'or' instruction must be integral values.  Both arguments must have identical
-types.
-
+types.
 
 Semantics:
 
-The truth table used for the 'or' instruction is:
+
The truth table used for the 'or' instruction is:
 
-
+
+

-
 In0   In1   Out
 0   0   0
 0   1   1
 1   0   1
 1   1   1
-
+
+
 
 Example:
+
    <result> = or int 4, %var         ; yields {int}:result = 4 | %var
   <result> = or int 15, 40          ; yields {int}:result = 47
   <result> = or int 4, 8            ; yields {int}:result = 12
 
 
+
 
 
-
'xor' Instruction
+
+  'xor' Instruction
+
+
+
 
 Syntax:
+
    <result> = xor <ty> <var1>, <var2>   ; yields {ty}:result
 
 
 Overview:
 
-The 'xor' instruction returns the bitwise logical exclusive or of its
-two operands.  The xor is used to implement the "one's complement"
-operation, which is the "~" operator in C.
+
The 'xor' instruction returns the bitwise logical exclusive or of
+its two operands.  The xor is used to implement the "one's complement"
+operation, which is the "~" operator in C.
 
 Arguments:
 
-The two arguments to the 'xor' instruction must be The two arguments to the 'xor' instruction must be integral values.  Both arguments must have identical
-types.
-
+types.
 
 Semantics:
 
-The truth table used for the 'xor' instruction is:
+
The truth table used for the 'xor' instruction is:
 
-
+
+

-
 In0   In1   Out
 0   0   0
 0   1   1
 1   0   1
 1   1   0
-
+
+

 
 
Example:
+
    <result> = xor int 4, %var         ; yields {int}:result = 4 ^ %var
   <result> = xor int 15, 40          ; yields {int}:result = 39
@@ -1226,61 +1467,78 @@
   <result> = xor int %V, -1          ; yields {int}:result = ~%V
 
 
+
 
 
-
'shl' Instruction
+
+  'shl' Instruction
+
+
+
 
 Syntax:
+
    <result> = shl <ty> <var1>, ubyte <var2>   ; yields {ty}:result
 
 
 Overview:
 
-The 'shl' instruction returns the first operand shifted to the left a
-specified number of bits.
+The 'shl' instruction returns the first operand shifted to the left
+a specified number of bits.
 
 Arguments:
 
-The first argument to the 'shl' instruction must be an The first argument to the 'shl' instruction must be an integer type.  The second argument must be an
-'ubyte' type.
+'ubyte' type.
 
 Semantics:
 
-The value produced is var1 * 2^var2.
-
+
The value produced is var1 * 2^var2.
 
 Example:
+
    <result> = shl int 4, ubyte %var   ; yields {int}:result = 4 << %var
   <result> = shl int 4, ubyte 2      ; yields {int}:result = 16
   <result> = shl int 1, ubyte 10     ; yields {int}:result = 1024
 
 
+
 
 
-
'shr' Instruction
+
+  'shr' Instruction
+
 
+
 
 Syntax:
+
    <result> = shr <ty> <var1>, ubyte <var2>   ; yields {ty}:result
 
 
 Overview:
-The 'shr' instruction returns the first operand shifted to the right a specified number of bits.
+
+The 'shr' instruction returns the first operand shifted to the right
+a specified number of bits.
 
 Arguments:
-The first argument to the 'shr' instruction must be an  integer type.  The second argument must be an 'ubyte' type.
+
+
The first argument to the 'shr' instruction must be an integer type.  The second argument must be an
+'ubyte' type.
 
 Semantics:
 
-If the first argument is a signed type, the most
+If the first argument is a signed type, the most
 significant bit is duplicated in the newly free'd bit positions.  If the first
-argument is unsigned, zero bits shall fill the empty positions.

+argument is unsigned, zero bits shall fill the empty positions.
 
 Example:
+
    <result> = shr int 4, ubyte %var   ; yields {int}:result = 4 >> %var
   <result> = shr uint 4, ubyte 1     ; yields {uint}:result = 2
@@ -1289,49 +1547,58 @@
   <result> = shr sbyte -2, ubyte 1   ; yields {sbyte}:result = -1
 
 
-
-
-
+
 
 
-
-    
-Memory Access Operations
-

+
+  Memory Access Operations

+
 
-A key design point of an SSA-based representation is how it represents memory.
-In LLVM, no memory locations are in SSA form, which makes things very simple.
-This section describes how to read, write, allocate and free memory in LLVM.
+

 
+A key design point of an SSA-based representation is how it represents
+memory.  In LLVM, no memory locations are in SSA form, which makes things very
+simple.  This section describes how to read, write, allocate and free memory in
+LLVM.
+
+
 
 
-
'malloc' Instruction
+
+  'malloc' Instruction
+
+
+
 
 Syntax:
+
    <result> = malloc <type>, uint <NumElements>     ; yields {type*}:result
   <result> = malloc <type>                         ; yields {type*}:result
 
 
 Overview:
-The 'malloc' instruction allocates memory from the system heap and returns a pointer to it.
+
+
The 'malloc' instruction allocates memory from the system heap and
+returns a pointer to it.
 
 Arguments:
 
-The the 'malloc' instruction allocates
+The the 'malloc' instruction allocates
 sizeof(<type>)*NumElements bytes of memory from the operating
 system, and returns a pointer of the appropriate type to the program.  The
 second form of the instruction is a shorter version of the first instruction
-that defaults to allocating one element.

+that defaults to allocating one element.
 
-'type' must be a sized type.
+
'type' must be a sized type.
 
 Semantics:
 
-Memory is allocated using the system "malloc" function, and a pointer
-is returned.
+
Memory is allocated using the system "malloc" function, and a
+pointer is returned.
 
 Example:
+
    %array  = malloc [4 x ubyte ]                    ; yields {[%4 x ubyte]*}:array
 
@@ -1340,29 +1607,35 @@
   %array2 = malloc [12 x ubyte], uint %size        ; yields {[12 x ubyte]*}:array2
 
 
+
 
 
-
'free' Instruction
+
+  'free' Instruction
+
+
+
 
 Syntax:
+
    free <type> <value>                              ; yields {void}
 
 
-
 Overview:
-The 'free' instruction returns memory back to the unused memory heap, to be reallocated in the future.
 
+
The 'free' instruction returns memory back to the unused memory
+heap, to be reallocated in the future.

 
 
Arguments:
 
-'value' shall be a pointer value that points to a value that was
-allocated with the 'malloc' instruction.
-
+
'value' shall be a pointer value that points to a value that was
+allocated with the 'malloc' instruction.
 
 Semantics:
 
-Access to the memory pointed to by the pointer is not longer defined after this instruction executes.
+
Access to the memory pointed to by the pointer is not longer defined after
+this instruction executes.
 
 Example:
 @@ -1370,11 +1643,17 @@
             free   [4 x ubyte]* %array
 
 
+
 
 
-
'alloca' Instruction
+
+  'alloca' Instruction
+
+
+
 
 Syntax:
+
    <result> = alloca <type>, uint <NumElements>  ; yields {type*}:result
   <result> = alloca <type>                      ; yields {type*}:result
@@ -1382,129 +1661,148 @@
 
 Overview:
 
-The 'alloca' instruction allocates memory on the current stack frame of
-the procedure that is live until the current function returns to its caller.
+
The 'alloca' instruction allocates memory on the current stack frame
+of the procedure that is live until the current function returns to its
+caller.
 
 Arguments:
 
-The the 'alloca' instruction allocates
+The the 'alloca' instruction allocates
 sizeof(<type>)*NumElements bytes of memory on the runtime stack,
 returning a pointer of the appropriate type to the program.  The second form of
 the instruction is a shorter version of the first that defaults to allocating
-one element.

+one element.
 
-'type' may be any sized type.
+
'type' may be any sized type.
 
 Semantics:
 
-Memory is allocated, a pointer is returned.  'alloca'd memory is
+Memory is allocated, a pointer is returned.  'alloca'd memory is
 automatically released when the function returns.  The 'alloca'
 instruction is commonly used to represent automatic variables that must have an
 address available.  When the function returns (either with the ret or invoke
-instructions), the memory is reclaimed.

+instructions), the memory is reclaimed.
 
 Example:
+
    %ptr = alloca int                              ; yields {int*}:ptr
   %ptr = alloca int, uint 4                      ; yields {int*}:ptr
 
 
+
 
 
-
'load' Instruction
+
+  'load' Instruction
+
+
+
 
 Syntax:
+
    <result> = load <ty>* <pointer>
   <result> = volatile load <ty>* <pointer>
 
 
 Overview:
-The 'load' instruction is used to read from memory.
+
+
The 'load' instruction is used to read from memory.
 
 Arguments:
 
-The argument to the 'load' instruction specifies the memory address to
-load from.  The pointer must point to a first class
-type.  If the load is marked as volatile then the optimizer is
-not allowed to modify the number or order of execution of this load
-with other volatile load and store
-instructions. 
+
The argument to the 'load' instruction specifies the memory address
+to load from.  The pointer must point to a first
+class type.  If the load is marked as volatile then the
+optimizer is not allowed to modify the number or order of execution of this
+load with other volatile load and store instructions. 
 
 Semantics:
 
-The location of memory pointed to is loaded.
+The location of memory pointed to is loaded.
 
 Examples:
+
    %ptr = alloca int                               ; yields {int*}:ptr
   store int 3, int* %ptr                          ; yields {void}
   %val = load int* %ptr                           ; yields {int}:val = int 3
 
 
-
-
+
 
 
-
'store' Instruction
+
+  'store' Instruction
+
 
 Syntax:
+
    store <ty> <value>, <ty>* <pointer>                   ; yields {void}
   volatile store <ty> <value>, <ty>* <pointer>                   ; yields {void}
 
 
 Overview:
-The 'store' instruction is used to write to memory.
+
+
The 'store' instruction is used to write to memory.
 
 Arguments:
 
-There are two arguments to the 'store' instruction: a value to store
+There are two arguments to the 'store' instruction: a value to store
 and an address to store it into.  The type of the '<pointer>'
 operand must be a pointer to the type of the '<value>' operand.
 If the store is marked as volatile then the optimizer is not
 allowed to modify the number or order of execution of this store with
 other volatile load and store
-instructions.

+instructions.
+
+Semantics: 
 
-Semantics: The contents of memory are updated to contain
-'<value>' at the location specified by the
-'<pointer>' operand.
+
The contents of memory are updated to contain '<value>' at the
+location specified by the '<pointer>' operand.
 
 Example:
+
    %ptr = alloca int                               ; yields {int*}:ptr
   store int 3, int* %ptr                          ; yields {void}
   %val = load int* %ptr                           ; yields {int}:val = int 3
 
 
-
-
+
 
 
-
'getelementptr' Instruction
+
+  'getelementptr' Instruction
+
+
+
 
 Syntax:
+
    <result> = getelementptr <ty>* <ptrval>{, long <aidx>|, ubyte <sidx>}*
 
 
 Overview:
 
-The 'getelementptr' instruction is used to get the address of a
-subelement of an aggregate data structure.
+
The 'getelementptr' instruction is used to get the address of a
+subelement of an aggregate data structure.
 
 Arguments:
 
-This instruction takes a list of long values and ubyte
+This instruction takes a list of long values and ubyte
 constants that indicate what form of addressing to perform.  The actual types of
 the arguments provided depend on the type of the first pointer argument.  The
 'getelementptr' instruction is used to index down through the type
-levels of a structure.

+levels of a structure.
 
-For example, lets consider a C code fragment and how it gets compiled to
-LLVM:
+
For example, let's consider a C code fragment and how it gets compiled to
+LLVM:
 
  struct RT {
@@ -1523,7 +1821,7 @@
 }
 
 
-The LLVM code generated by the GCC frontend is:
+The LLVM code generated by the GCC frontend is:
 
  %RT = type { sbyte, [10 x [20 x int]], sbyte }
@@ -1537,25 +1835,25 @@
 
 Semantics:
 
-The index types specified for the 'getelementptr' instruction depend on
-the pointer type that is being index into.  Pointer and
-array types require 'long' values, and The index types specified for the 'getelementptr' instruction depend
+on the pointer type that is being index into.  Pointer
+and array types require 'long' values, and structure types require 'ubyte'
-constants.
+constants.
 
-In the example above, the first index is indexing into the '%ST*' type,
-which is a pointer, yielding a '%ST' = '{ int, double, %RT }'
-type, a structure.  The second index indexes into the third element of the
-structure, yielding a '%RT' = '{ sbyte, [10 x [20 x int]], sbyte
-}' type, another structure.  The third index indexes into the second
+In the example above, the first index is indexing into the '%ST*'
+type, which is a pointer, yielding a '%ST' = '{ int, double, %RT
+}' type, a structure.  The second index indexes into the third element of
+the structure, yielding a '%RT' = '{ sbyte, [10 x [20 x int]],
+sbyte }' type, another structure.  The third index indexes into the second
 element of the structure, yielding a '[10 x [20 x int]]' type, an
 array.  The two dimensions of the array are subscripted into, yielding an
 'int' type.  The 'getelementptr' instruction return a pointer
-to this element, thus yielding a 'int*' type.

+to this element, thus yielding a 'int*' type.
 
-Note that it is perfectly legal to index partially through a structure,
+Note that it is perfectly legal to index partially through a structure,
 returning a pointer to an inner element.  Because of this, the LLVM code for the
-given testcase is equivalent to:

+given testcase is equivalent to:
 
  int* "foo"(%ST* %s) {
@@ -1568,54 +1866,61 @@
 }
 
 
-
-
 Example:
+
    ; yields [12 x ubyte]*:aptr
   %aptr = getelementptr {int, [12 x ubyte]}* %sptr, long 0, ubyte 1
 
 
-
+
 
 
-
-    
-Other Operations
-

+
+  Other Operations
+
 
-The instructions in this catagory are the "miscellaneous" instructions, which defy better classification.
+

 
+The instructions in this catagory are the "miscellaneous" instructions, which
+defy better classification.
+
+
 
 
-
'phi' Instruction
+
+  'phi' Instruction
+
+
+
 
 Syntax:
+
    <result> = phi <ty> [ <val0>, <label0>], ...
 
 
 Overview:
 
-The 'phi' instruction is used to implement the φ node in the SSA
-graph representing the function.
+
The 'phi' instruction is used to implement the φ node in the SSA
+graph representing the function.
 
 Arguments:
 
-The type of the incoming values are specified with the first type field.  After
-this, the 'phi' instruction takes a list of pairs as arguments, with
-one pair for each predecessor basic block of the current block.  Only values of
-first class type may be used as the value arguments
-to the PHI node.  Only labels may be used as the label arguments.
+
The type of the incoming values are specified with the first type field.
+After this, the 'phi' instruction takes a list of pairs as arguments,
+with one pair for each predecessor basic block of the current block.  Only
+values of first class type may be used as the value
+arguments to the PHI node.  Only labels may be used as the label arguments.
 
-There must be no non-phi instructions between the start of a basic block and the
-PHI instructions: i.e. PHI instructions must be first in a basic block.
+
There must be no non-phi instructions between the start of a basic block and
+the PHI instructions: i.e. PHI instructions must be first in a basic block.
 
 Semantics:
 
-At runtime, the 'phi' instruction logically takes on the value
+At runtime, the 'phi' instruction logically takes on the value
 specified by the parameter, depending on which basic block we came from in the
-last terminator instruction.

+last terminator instruction.
 
 Example:
 
@@ -1626,222 +1931,253 @@
   br label %Loop
 
 
+
 
 
-
'cast .. to' Instruction
+
+  'cast .. to' Instruction
+
+
+
 
 Syntax:
+
    <result> = cast <ty> <value> to <ty2>             ; yields ty2
 
 
 Overview:
 
-The 'cast' instruction is used as the primitive means to convert
+The 'cast' instruction is used as the primitive means to convert
 integers to floating point, change data type sizes, and break type safety (by
-casting pointers).

+casting pointers).
 
 Arguments:
 
-The 'cast' instruction takes a value to cast, which must be a first
+The 'cast' instruction takes a value to cast, which must be a first
 class value, and a type to cast it to, which must also be a first class type.

+href="#t_firstclass">first class type.
 
 Semantics:
 
-This instruction follows the C rules for explicit casts when determining how the
-data being cast must change to fit in its new container.
+
This instruction follows the C rules for explicit casts when determining how
+the data being cast must change to fit in its new container.
 
-When casting to bool, any value that would be considered true in the context of
-a C 'if' condition is converted to the boolean 'true' values,
-all else are 'false'.
+
When casting to bool, any value that would be considered true in the context
+of a C 'if' condition is converted to the boolean 'true'
+values, all else are 'false'.
 
-When extending an integral value from a type of one signness to another (for
+When extending an integral value from a type of one signness to another (for
 example 'sbyte' to 'ulong'), the value is sign-extended if the
 source value is signed, and zero-extended if the source value is
 unsigned.  bool values are always zero extended into either zero or
-one.

+one.
 
 Example:
+
    %X = cast int 257 to ubyte              ; yields ubyte:1
   %Y = cast int 123 to bool               ; yields bool:true
 
 
-
+
 
 
-
'call' Instruction
+
+  'call' Instruction
+
+
+
 
 Syntax:
+
    <result> = call <ty>* <fnptrval>(<param list>)
 
 
 Overview:
 
-The 'call' instruction represents a simple function call.
+
The 'call' instruction represents a simple function call.
 
 Arguments:
 
-This instruction requires several arguments:
-

+This instruction requires several arguments:
 
-'ty': shall be the signature of the pointer to function value being
-invoked.  The argument types must match the types implied by this signature.
+

 
-'fnptrval': An LLVM value containing a pointer to a function to be
-invoked. In most cases, this is a direct function invocation, but indirect
-calls are just as possible, calling an arbitrary pointer to function
-values.
+  
'ty': shall be the signature of the pointer to function value
+  being invoked.  The argument types must match the types implied by this
+  signature.
+
+  'fnptrval': An LLVM value containing a pointer to a function
+  to be invoked. In most cases, this is a direct function invocation, but
+  indirect calls are just as possible, calling an arbitrary pointer to
+  function values.
+
+  'function args': argument list whose types match the function
+  signature argument types.  If the function signature indicates the function
+  accepts a variable number of arguments, the extra arguments can be
+  specified.
 
-'function args': argument list whose types match the function
-signature argument types.  If the function signature indicates the function
-accepts a variable number of arguments, the extra arguments can be specified. 
 
 
 Semantics:
 
-The 'call' instruction is used to cause control flow to transfer to a
-specified function, with its incoming arguments bound to the specified values.
+The 'call' instruction is used to cause control flow to transfer to
+a specified function, with its incoming arguments bound to the specified values.
 Upon a 'ret' instruction in the called function,
 control flow continues with the instruction after the function call, and the
 return value of the function is bound to the result argument.  This is a simpler
-case of the invoke instruction.

+case of the invoke instruction.
 
 Example:
+
    %retval = call int %test(int %argc)
   call int(sbyte*, ...) *%printf(sbyte* %msg, int 12, sbyte 42);
-
 
 
+
+
 
-
'vanext' Instruction
+
+  'vanext' Instruction
+
+
+
 
 Syntax:
+
    <resultarglist> = vanext <va_list> <arglist>, <argty>
 
 
 Overview:
 
-The 'vanext' instruction is used to access arguments passed through
+The 'vanext' instruction is used to access arguments passed through
 the "variable argument" area of a function call.  It is used to implement the
-va_arg macro in C.

+va_arg macro in C.
 
 Arguments:
 
-This instruction takes a valist value and the type of the argument.  It
-returns another valist.
+This instruction takes a valist value and the type of the argument.
+It returns another valist.
 
 Semantics:
 
-The 'vanext' instruction advances the specified valist past
+The 'vanext' instruction advances the specified valist past
 an argument of the specified type.  In conjunction with the vaarg instruction, it is used to implement the
 va_arg macro available in C.  For more information, see the variable
-argument handling Intrinsic Functions.

+argument handling Intrinsic Functions.
 
-It is legal for this instruction to be called in a function which does not take
-a variable number of arguments, for example, the vfprintf function.
+
It is legal for this instruction to be called in a function which does not
+take a variable number of arguments, for example, the vfprintf
+function.
 
-vanext is an LLVM instruction instead of an vanext is an LLVM instruction instead of an intrinsic function because it takes an type as an
 argument.
 
 Example:
 
-See the variable argument processing section.
-
+
See the variable argument processing section.
 
+
 
 
-
'vaarg' Instruction
+
+  'vaarg' Instruction
+
+
+
 
 Syntax:
+
    <resultval> = vaarg <va_list> <arglist>, <argty>
 
 
 Overview:
 
-The 'vaarg' instruction is used to access arguments passed through
+The 'vaarg' instruction is used to access arguments passed through
 the "variable argument" area of a function call.  It is used to implement the
-va_arg macro in C.

+va_arg macro in C.
 
 Arguments:
 
-This instruction takes a valist value and the type of the argument.  It
-returns a value of the specified argument type.
+This instruction takes a valist value and the type of the argument.
+It returns a value of the specified argument type.
 
 Semantics:
 
-The 'vaarg' instruction loads an argument of the specified type from
+The 'vaarg' instruction loads an argument of the specified type from
 the specified va_list.  In conjunction with the vanext instruction, it is used to implement the
 va_arg macro available in C.  For more information, see the variable
-argument handling Intrinsic Functions.

+argument handling Intrinsic Functions.
 
-It is legal for this instruction to be called in a function which does not take
-a variable number of arguments, for example, the vfprintf function.
+
It is legal for this instruction to be called in a function which does not
+take a variable number of arguments, for example, the vfprintf
+function.
 
-vaarg is an LLVM instruction instead of an vaarg is an LLVM instruction instead of an intrinsic function because it takes an type as an
 argument.
 
 Example:
 
-See the variable argument processing section.
-
-
-
+
See the variable argument processing section.
 
+
 
 
-
-
-Intrinsic Functions
-

+
+  Intrinsic Functions
+
 
 
-LLVM supports the notion of an "intrinsic function".  These functions have well
-known names and semantics, and are required to follow certain restrictions.
+
+
+LLVM supports the notion of an "intrinsic function".  These functions have
+well known names and semantics, and are required to follow certain restrictions.
 Overall, these instructions represent an extension mechanism for the LLVM
 language that does not require changing all of the transformations in LLVM to
-add to the language (or the bytecode reader/writer, the parser, etc...).

+add to the language (or the bytecode reader/writer, the parser, etc...).
 
-Intrinsic function names must all start with an "llvm." prefix, this
+Intrinsic function names must all start with an "llvm." prefix, this
 prefix is reserved in LLVM for intrinsic names, thus functions may not be named
 this.  Intrinsic functions must always be external functions: you cannot define
 the body of intrinsic functions.  Intrinsic functions may only be used in call
 or invoke instructions: it is illegal to take the address of an intrinsic
 function.  Additionally, because intrinsic functions are part of the LLVM
-language, it is required that they all be documented here if any are added.

+language, it is required that they all be documented here if any are added.
 
-Unless an intrinsic function is target-specific, there must be a lowering pass
-to eliminate the intrinsic or all backends must support the intrinsic
-function.
+
Unless an intrinsic function is target-specific, there must be a lowering
+pass to eliminate the intrinsic or all backends must support the intrinsic
+function.
 
+
 
 
-
-    
-Variable Argument Handling Intrinsics
-

+
+  Variable Argument Handling Intrinsics
+
 
-Variable argument support is defined in LLVM with the 
+
+Variable argument support is defined in LLVM with the vanext instruction and these three intrinsic
 functions.  These functions are related to the similarly named macros defined in
-the <stdarg.h> header file.

+the <stdarg.h> header file.
 
-All of these functions operate on arguments that use a target-specific value
+All of these functions operate on arguments that use a target-specific value
 type "va_list".  The LLVM assembly language reference manual does not
 define what this type is, so all transformations should be prepared to handle
-intrinsics with any type used.

+intrinsics with any type used.
 
-This example shows how the vanext instruction
-and the variable argument handling intrinsic functions are used.
+
This example shows how the vanext
+instruction and the variable argument handling intrinsic functions are used.
 
  int %test(int %X, ...) {
@@ -1864,100 +2200,115 @@
 }
 
 
+
+
 
-
'llvm.va_start' Intrinsic
+
+  'llvm.va_start' Intrinsic
+
+
+
 
 Syntax:
+
    call va_list ()* %llvm.va_start()
 
 
 Overview:
 
-The 'llvm.va_start' intrinsic returns a new <arglist>
-for subsequent use by the variable argument intrinsics.
+
The 'llvm.va_start' intrinsic returns a new <arglist>
+for subsequent use by the variable argument intrinsics.
 
 Semantics:
 
-The 'llvm.va_start' intrinsic works just like the va_start
+The 'llvm.va_start' intrinsic works just like the va_start
 macro available in C.  In a target-dependent way, it initializes and returns a
 va_list element, so that the next vaarg will produce the first
 variable argument passed to the function.  Unlike the C va_start macro,
 this intrinsic does not need to know the last argument of the function, the
-compiler can figure that out.

+compiler can figure that out.
 
-Note that this intrinsic function is only legal to be called from within the
-body of a variable argument function.
+
Note that this intrinsic function is only legal to be called from within the
+body of a variable argument function.
 
+
 
 
-
'llvm.va_end' Intrinsic
+
+  'llvm.va_end' Intrinsic
+
+
+
 
 Syntax:
+
    call void (va_list)* %llvm.va_end(va_list <arglist>)
 
 
 Overview:
 
-The 'llvm.va_end' intrinsic destroys <arglist> which has
-been initialized previously with The 'llvm.va_end' intrinsic destroys <arglist> which
+has been initialized previously with llvm.va_start or llvm.va_copy.
+href="#i_va_copy">llvm.va_copy.
 
 Arguments:
 
-The argument is a va_list to destroy.
+
The argument is a va_list to destroy.
 
 Semantics:
 
-The 'llvm.va_end' intrinsic works just like the va_end macro
-available in C.  In a target-dependent way, it destroys the va_list.
-Calls to llvm.va_start and llvm.va_copy must be matched exactly with calls
-to llvm.va_end.
-
+
The 'llvm.va_end' intrinsic works just like the va_end
+macro available in C.  In a target-dependent way, it destroys the
+va_list.  Calls to llvm.va_start and
+llvm.va_copy must be matched exactly with
+calls to llvm.va_end.
 
+
 
 
-
'llvm.va_copy' Intrinsic
+
+  'llvm.va_copy' Intrinsic
+
+
+
 
 Syntax:
+
    call va_list (va_list)* %llvm.va_copy(va_list <destarglist>)
 
 
 Overview:
 
-The 'llvm.va_copy' intrinsic copies the current argument position from
-the source argument list to the destination argument list.
+
The 'llvm.va_copy' intrinsic copies the current argument position
+from the source argument list to the destination argument list.
 
 Arguments:
 
-The argument is the va_list to copy.
+The argument is the va_list to copy.
 
 Semantics:
 
-The 'llvm.va_copy' intrinsic works just like the va_copy macro
-available in C.  In a target-dependent way, it copies the source
+The 'llvm.va_copy' intrinsic works just like the va_copy
+macro available in C.  In a target-dependent way, it copies the source
 va_list element into the returned list.  This intrinsic is necessary
 because the llvm.va_start intrinsic may be
-arbitrarily complex and require memory allocation, for example.

+arbitrarily complex and require memory allocation, for example.
 
+
 
 
-
-
-
 
 
-
-Chris Lattner
-The LLVM Compiler Infrastructure
-

-
-
-Last modified: Wed Oct 29 19:30:46 CST 2003
-
-
-
+
+  Chris Lattner
+  The LLVM Compiler Infrastructure
+  

+  Last modified: $Date: 2003/11/08 01:05:38 $
+
+
+
+




From lattner at cs.uiuc.edu  Fri Nov  7 22:30:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Nov  7 22:30:01 2003
Subject: [llvm-commits] CVS: llvm-www/releases/1.0/docs/ReleaseNotes.html
Message-ID: <200311080429.WAA08595@zion.cs.uiuc.edu>


Changes in directory llvm-www/releases/1.0/docs:

ReleaseNotes.html updated: 1.23 -> 1.24

---
Log message:

Update


---
Diffs of the changes:  (+7 -1)

Index: llvm-www/releases/1.0/docs/ReleaseNotes.html
diff -u llvm-www/releases/1.0/docs/ReleaseNotes.html:1.23 llvm-www/releases/1.0/docs/ReleaseNotes.html:1.24

--- llvm-www/releases/1.0/docs/ReleaseNotes.html:1.23	Fri Nov  7 16:20:17 2003
+++ llvm-www/releases/1.0/docs/ReleaseNotes.html	Fri Nov  7 22:29:18 2003
@@ -167,6 +167,12 @@
 vaarg instruction
 
 
+
Missing features in 1.0, implemented in 1.1:
+
+
The interpreter does not support
+invoke or unwind

+
+
 
Bugs in 1.0 fixed in 1.1:
 
 
[inliner] Inlining invoke with PHI in unwind target is broken

@@ -482,6 +488,6 @@
 Maintained By: The LLVM Team

 
 
-Last modified: Fri Nov  7 16:19:42 CST 2003
+Last modified: Fri Nov  7 22:27:02 CST 2003
 
 




From lattner at cs.uiuc.edu  Fri Nov  7 22:30:09 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Nov  7 22:30:09 2003
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200311080429.WAA08468@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.32 -> 1.33

---
Log message:

Add news from brian


---
Diffs of the changes:  (+22 -7)

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.32 llvm/docs/ReleaseNotes.html:1.33
--- llvm/docs/ReleaseNotes.html:1.32	Thu Nov  6 22:46:56 2003
+++ llvm/docs/ReleaseNotes.html	Fri Nov  7 22:28:55 2003
@@ -65,16 +65,34 @@
 release implements the following new features:

 
 

-A new LLVM profiler, similar to gprof is available
-The LLVM C/C++ front-end now compiles on Mac OSX!
+A new LLVM profiler, similar to gprof is available

+
+
LLVM and the C/C++ front-end now compile on Mac OSX!  Mac OSX users can now
+explore the LLVM optimizer with the C backend (note that LLVM requires GCC 3.3
+on Mac OSX).

+
+

+
+In this release, the following missing features were implemented:

+
+

+The interpreter does not support
+invoke or unwind
 

 
 In this release, the following Quality of Implementation issues were fixed:

 
 

-C++ front-end is not generating linkonce linkage type when it can
+
+C++ front-end is not generating
+linkonce linkage type when it can
+
+C front-end doesn't emit
+getelementptr for address of array element
+
 

 
+
 In this release, the following bugs in the previous release were fixed:

 
 

@@ -159,9 +177,6 @@
 Linking in static archive files (.a files) is very slow (there is no symbol
 table in the archive).
 
-
Interpreter does not support invoke
-or unwind.
-
 
LLVM cannot handle structures with
 more than 256 elements.
 
@@ -410,6 +425,6 @@
 Maintained By: The LLVM Team

 
 
-Last modified: Thu Nov  6 13:21:28 CST 2003
+Last modified: Fri Nov  7 22:26:24 CST 2003
 
 




From lattner at cs.uiuc.edu  Fri Nov  7 23:14:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Nov  7 23:14:00 2003
Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/crtend/Exception.cpp
Message-ID: <200311080513.XAA09161@zion.cs.uiuc.edu>


Changes in directory llvm/runtime/GCCLibraries/crtend:

Exception.cpp updated: 1.1 -> 1.2

---
Log message:

Fix wierd problems linking C programs which look for symbols in libstdc++.  
This was due to the 'assert' macro expanding into a function call on some 
platforms which could throw.  The C++ compiler then added checks for the
exception specifications in these functions, which pulled in the C++ runtime.
This was bad, and the assertions can never fire (the library is now debugged)
so just remove them.


---
Diffs of the changes:  (+0 -3)

Index: llvm/runtime/GCCLibraries/crtend/Exception.cpp
diff -u llvm/runtime/GCCLibraries/crtend/Exception.cpp:1.1 llvm/runtime/GCCLibraries/crtend/Exception.cpp:1.2
--- llvm/runtime/GCCLibraries/crtend/Exception.cpp:1.1	Sat Aug 30 18:17:51 2003
+++ llvm/runtime/GCCLibraries/crtend/Exception.cpp	Fri Nov  7 23:13:40 2003
@@ -6,7 +6,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Exception.h"
-#include 
 
 // Thread local state for exception handling.  FIXME: This should really be made
 // thread-local!
@@ -26,7 +25,6 @@
 // returns a pointer to the exception area data.
 //
 void *__llvm_eh_current_uncaught_exception_type(unsigned HandlerType) throw() {
-  assert(UncaughtExceptionStack && "No uncaught exception!");
   if (UncaughtExceptionStack->ExceptionType == HandlerType)
     return UncaughtExceptionStack+1;
   return 0;
@@ -44,7 +42,6 @@
 // __llvm_eh_get_uncaught_exception - Returns the current uncaught exception.
 // There must be an uncaught exception for this to work!
 llvm_exception *__llvm_eh_get_uncaught_exception() throw() {
-  assert(UncaughtExceptionStack && "There are no uncaught exceptions!?!?");
   return UncaughtExceptionStack;
 }
 




From lattner at cs.uiuc.edu  Fri Nov  7 23:20:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Nov  7 23:20:00 2003
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200311080519.XAA09372@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.33 -> 1.34

---
Log message:

sjlj bug


---
Diffs of the changes:  (+1 -0)

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.33 llvm/docs/ReleaseNotes.html:1.34
--- llvm/docs/ReleaseNotes.html:1.33	Fri Nov  7 22:28:55 2003
+++ llvm/docs/ReleaseNotes.html	Fri Nov  7 23:18:50 2003
@@ -122,6 +122,7 @@
 
[lowersetjmp] Lowersetjmp pass breaks dominance properties!
 llvm-gcc tries to add bools
 [buildscripts] Building into objdir with .o in it fails
+[setjmp/longjmp] Linking C programs which use setjmp/longjmp sometimes fail with references to the C++ runtime library!
 

 
 At this time, LLVM is known to work properly with SPEC CPU 2000, the Olden




From lattner at cs.uiuc.edu  Fri Nov  7 23:21:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Nov  7 23:21:01 2003
Subject: [llvm-commits] CVS: llvm-www/releases/1.0/docs/ReleaseNotes.html
Message-ID: <200311080520.XAA09503@zion.cs.uiuc.edu>


Changes in directory llvm-www/releases/1.0/docs:

ReleaseNotes.html updated: 1.24 -> 1.25

---
Log message:

New bug


---
Diffs of the changes:  (+3 -0)

Index: llvm-www/releases/1.0/docs/ReleaseNotes.html
diff -u llvm-www/releases/1.0/docs/ReleaseNotes.html:1.24 llvm-www/releases/1.0/docs/ReleaseNotes.html:1.25
--- llvm-www/releases/1.0/docs/ReleaseNotes.html:1.24	Fri Nov  7 22:29:18 2003
+++ llvm-www/releases/1.0/docs/ReleaseNotes.html	Fri Nov  7 23:20:14 2003
@@ -200,6 +200,9 @@
 
[buildscripts] Building into objdir
 with .o in it fails

 
+
[setjmp/longjmp] Linking C programs which use setjmp/longjmp sometimes fail with references to the C++ runtime library!

+
+
 
 
Known problems with the C front-end

 




From lattner at cs.uiuc.edu  Fri Nov  7 23:23:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Nov  7 23:23:02 2003
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200311080522.XAA09638@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.34 -> 1.35

---
Log message:

Update the portability section


---
Diffs of the changes:  (+7 -4)

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.34 llvm/docs/ReleaseNotes.html:1.35
--- llvm/docs/ReleaseNotes.html:1.34	Fri Nov  7 23:18:50 2003
+++ llvm/docs/ReleaseNotes.html	Fri Nov  7 23:22:09 2003
@@ -139,11 +139,14 @@
 
 
 
-LLVM has only been extensively tested on Intel and AMD machines running Red
-Hat Linux, and Sun UltraSPARC workstations running Solaris 8.
+LLVM has been extensively tested on Intel and AMD machines running Red
+Hat Linux, and Sun UltraSPARC workstations running Solaris 8.  Additionally, 
+LLVM works on Mac OS/X 10.3 and above, but only with the C back-end (no native
+backend for the PowerPC is available yet).
 The core LLVM infrastructure uses "autoconf" for portability, so hopefully we
-work on more platforms than that.  However, it is extremely likely that we
-missed something.  We welcome portability patches and error messages.
+work on more platforms than that.  However, it is likely that we
+missed something, and that minor porting is required to get LLVM to work on 
+new platforms.  We welcome portability patches and error messages.
 
 
 




From lattner at cs.uiuc.edu  Fri Nov  7 23:26:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Nov  7 23:26:01 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
Message-ID: <200311080525.XAA09671@zion.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

PoolAllocatorBitMask.cpp updated: 1.25 -> 1.26

---
Log message:

Rename this file, to indicate what it REALLY implements.


---
Diffs of the changes:  (+1 -1)

Index: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
diff -u poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.25 poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.26
--- poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.25	Fri Nov  7 17:55:35 2003
+++ poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp	Fri Nov  7 23:24:56 2003
@@ -1,4 +1,4 @@
-//===- PoolAllocatorChained.cpp - Implementation of poolallocator runtime -===//
+//===- PoolAllocatorBitMask.cpp - Implementation of poolallocator runtime -===//
 // 
 //                       The LLVM Compiler Infrastructure
 //




From lattner at cs.uiuc.edu  Sat Nov  8 01:23:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 01:23:02 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
Message-ID: <200311080722.BAA25962@zion.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

PoolAllocatorBitMask.cpp updated: 1.26 -> 1.27

---
Log message:

Make deletes much more efficient through the use of an extra data member, which
speeds up FIFO usage patterns, and by optimizing the scanning case.


---
Diffs of the changes:  (+56 -13)

Index: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
diff -u poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.26 poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.27
--- poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.26	Fri Nov  7 23:24:56 2003
+++ poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp	Sat Nov  8 01:22:19 2003
@@ -44,6 +44,9 @@
   // FirstUnused - First empty node in slab
   unsigned short FirstUnused;
 
+  // UsedBegin - The first node in the slab that is used.
+  unsigned short UsedBegin;
+
   // UsedEnd - 1 past the last allocated node in slab. 0 if slab is empty
   unsigned short UsedEnd;
 
@@ -172,12 +175,13 @@
 
   unsigned Size = sizeof(PoolSlab) + 4*((NodesPerSlab+15)/16) +
                   Pool->NodeSize*getSlabSize(Pool);
-  assert(Size < PageSize && "Trying to allocate a slab larger than a page!");
+  assert(Size <= PageSize && "Trying to allocate a slab larger than a page!");
   PoolSlab *PS = (PoolSlab*)AllocatePage();
 
   PS->NumNodesInSlab = NodesPerSlab;
   PS->isSingleArray = 0;  // Not a single array!
   PS->FirstUnused = 0;    // Nothing allocated.
+  PS->UsedBegin   = 0;    // Nothing allocated.
   PS->UsedEnd     = 0;    // Nothing allocated.
 
   // Add the slab to the list...
@@ -378,13 +382,35 @@
   
   // Update the first free field if this node is below the free node line
   if (ElementIdx < FirstUnused) FirstUnused = ElementIdx;
+
+  // Update the first used field if this node was the first used.
+  if (ElementIdx == UsedBegin) UsedBegin = ElementEndIdx;
   
   // If we are freeing the last element in a slab, shrink the UsedEnd marker
   // down to the last used node.
   if (ElementEndIdx == UE) {
-    UsedEnd = lastNodeAllocated(ElementIdx);
-    assert(FirstUnused <= UsedEnd &&
-           "FirstUnused field was out of date!");
+#if 0
+      printf("FU: %d, UB: %d, UE: %d  FREED: [%d-%d)",
+           FirstUnused, UsedBegin, UsedEnd, ElementIdx, ElementEndIdx);
+#endif
+
+    // If the user is freeing the slab entirely in-order, it's quite possible
+    // that all nodes are free in the slab.  If this is the case, simply reset
+    // our pointers.
+    if (UsedBegin == UE) {
+      //printf(": SLAB EMPTY\n");
+      FirstUnused = 0;
+      UsedBegin = 0;
+      UsedEnd = 0;
+    } else if (FirstUnused == ElementIdx) {
+      // Freed the last node(s) in this slab.
+      FirstUnused = ElementIdx;
+      UsedEnd = ElementIdx;
+    } else {
+      UsedEnd = lastNodeAllocated(ElementIdx);
+      assert(FirstUnused <= UsedEnd &&
+             "FirstUnused field was out of date!");
+    }
   }
 }
 
@@ -394,32 +420,49 @@
   unsigned short Flags = NodeFlagsVector[CurWord] & 0xFFFF;
   if (Flags) {
     // Mask off nodes above this one
-    Flags &= (1 << (ScanIdx & 15))-1;
+    Flags &= (1 << ((ScanIdx & 15)+1))-1;
     if (Flags) {
       // If there is still something in the flags vector, then there is a node
       // allocated in this part.  The goto is a hack to get the uncommonly
       // executed code away from the common code path.
+      //printf("A: ");
       goto ContainsAllocatedNode;
     }
   }
 
   // Ok, the top word doesn't contain anything, scan the whole flag words now.
-  ScanIdx &= ~15;
   --CurWord;
   while (CurWord != ~0U) {
-    if (NodeFlagsVector[CurWord] & 0xFFFF)
+    Flags = NodeFlagsVector[CurWord] & 0xFFFF;
+    if (Flags) {
+      // There must be a node allocated in this word!
+      //printf("B: ");
       goto ContainsAllocatedNode;
+    }
     CurWord--;
-    ScanIdx -= 16;
   }
   return 0;
 
 ContainsAllocatedNode:
-  // Figure out exactly which node is allocated in this word now.
-  // FIXME: this could be made to be more efficient!
-  do {
-    --ScanIdx;
-  } while (ScanIdx && !isNodeAllocated(ScanIdx-1));
+  // Figure out exactly which node is allocated in this word now.  The node
+  // allocated is the one with the highest bit set in 'Flags'.
+  //
+  // This should use __builtin_clz to get the value, but this builtin is only
+  // available with GCC 3.4 and above.  :(
+  assert(Flags && "Should have allocated node!");
+  
+  unsigned short MSB;
+#if GCC3_4_EVENTUALLY
+  MSB = 16 - ::__builtin_clz(Flags);
+#else
+  for (MSB = 15; (Flags & (1U << MSB)) == 0; --MSB)
+    /*empty*/;
+#endif
+
+  assert((1U << MSB) & Flags);   // The bit should be set
+  assert((~(1U << MSB) & Flags) < Flags);// Removing it should make flag smaller
+  ScanIdx = CurWord*16 + MSB;
+  assert(isNodeAllocated(ScanIdx));
   return ScanIdx;
 }
 




From gaeke at cs.uiuc.edu  Sat Nov  8 12:13:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat Nov  8 12:13:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcRegInfo.cpp SparcV9_Reg.td
Message-ID: <200311081812.MAA17008@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcRegInfo.cpp updated: 1.112 -> 1.113
SparcV9_Reg.td updated: 1.6 -> 1.7

---
Log message:

Fix two typos I found in comments.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Target/Sparc/SparcRegInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.112 llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.113
--- llvm/lib/Target/Sparc/SparcRegInfo.cpp:1.112	Mon Oct 20 14:43:17 2003
+++ llvm/lib/Target/Sparc/SparcRegInfo.cpp	Sat Nov  8 12:12:24 2003
@@ -760,7 +760,7 @@
       RegClass* RC = PRA.getRegClassByID(this->getRegClassIDOfRegType(RegType));
       OffReg = PRA.getUnusedUniRegAtMI(RC, RegType, MInst, LVSetBef);
 #else
-      // Default to using register g2 for holding large offsets
+      // Default to using register g4 for holding large offsets
       OffReg = getUnifiedRegNum(UltraSparcRegInfo::IntRegClassID,
                                 SparcIntRegClass::g4);
 #endif
@@ -845,7 +845,7 @@
       RegClass* RC = PRA.getRegClassByID(this->getRegClassIDOfRegType(RegType));
       OffReg = PRA.getUnusedUniRegAtMI(RC, RegType, MInst, LVSetBef);
 #else
-      // Default to using register g2 for holding large offsets
+      // Default to using register g4 for holding large offsets
       OffReg = getUnifiedRegNum(UltraSparcRegInfo::IntRegClassID,
                                 SparcIntRegClass::g4);
 #endif


Index: llvm/lib/Target/Sparc/SparcV9_Reg.td
diff -u llvm/lib/Target/Sparc/SparcV9_Reg.td:1.6 llvm/lib/Target/Sparc/SparcV9_Reg.td:1.7
--- llvm/lib/Target/Sparc/SparcV9_Reg.td:1.6	Tue Oct 21 10:17:13 2003
+++ llvm/lib/Target/Sparc/SparcV9_Reg.td	Sat Nov  8 12:12:24 2003
@@ -32,7 +32,7 @@
 
 // For fun, specify a register class.
 //
-// FIXME: the register order should be defined in terms of the prefered
+// FIXME: the register order should be defined in terms of the preferred
 // allocation order...
 //
 def IntRegs : RegisterClass


Changes in directory reopt/include/reopt:

MappingInfo.h updated: 1.9 -> 1.10

---
Log message:

Modify some prototypes to conform to their definitions or comments.
Add prototype for getLLVMFunctionPositionInfo.


---
Diffs of the changes:  (+8 -2)

Index: reopt/include/reopt/MappingInfo.h
diff -u reopt/include/reopt/MappingInfo.h:1.9 reopt/include/reopt/MappingInfo.h:1.10
--- reopt/include/reopt/MappingInfo.h:1.9	Fri Aug 22 12:43:34 2003
+++ reopt/include/reopt/MappingInfo.h	Sat Nov  8 12:14:13 2003
@@ -17,11 +17,17 @@
 class Module;
 class Function;
 
+/// Returns the index in _llvm_regAllocState.functions[] where F's register
+/// allocation data may be found. It is a runtime error to call this on a
+/// function which was recently added to the module.
+///
+unsigned getLLVMFunctionPositionInfo (Function *F);
+
 /// getLLVMInstrPositionInfo - Look up the given Instruction in the
 /// LLVM-to-MI map for the Function that contains it, and return the
 /// vector of integers (?) that represents it.
 ///
-std::vector getLLVMInstrPositionInfo(Instruction *LI);
+std::vector getLLVMInstrPositionInfo (Instruction *LI);
 
 /// getBasicBlockInfo(BasicBlock *) - Find the given BasicBlock in the
 /// forward basic block map, and return the pair of 64-bit addresses
@@ -36,7 +42,7 @@
 /// set BB to the BasicBlock that corresponds to it. Otherwise, return
 /// false.
 ///
-bool getReverseBBMap(uint64_t addr, Module *M, BasicBlock* &bb);
+bool getReverseBBMap (uint64_t addr, Module *M, BasicBlock *&BB);
 
 /// isInlinable - Looks up the given function in the
 /// llvmSimpleFunction table. llvmSimpleFunction and llvmFunctionCount




From gaeke at cs.uiuc.edu  Sat Nov  8 12:25:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat Nov  8 12:25:01 2003
Subject: [llvm-commits] CVS: reopt/lib/Mapping/getLLVMinfo.cpp
Message-ID: <200311081824.MAA17155@zion.cs.uiuc.edu>


Changes in directory reopt/lib/Mapping:

getLLVMinfo.cpp updated: 1.21 -> 1.22

---
Log message:

C-ify the way some extern declarations are spelled.

Use 'std::map' instead of just saying 'map'.

Make FunctionKey, BasicBlockKey, and llvmInstructionKey file-private (again?).

Refactor getLLVMInstrPositionInfo() so that it shares code with
getLLVMFunctionPositionInfo() (formerly getSavedStateIndexOfFunction());
their shared code is now called maybeFillInMapsForModule().

Move forward decls of create*() methods farther down in the file, closer
to their first uses.


---
Diffs of the changes:  (+47 -28)

Index: reopt/lib/Mapping/getLLVMinfo.cpp
diff -u reopt/lib/Mapping/getLLVMinfo.cpp:1.21 reopt/lib/Mapping/getLLVMinfo.cpp:1.22
--- reopt/lib/Mapping/getLLVMinfo.cpp:1.21	Thu Oct 30 14:42:42 2003
+++ reopt/lib/Mapping/getLLVMinfo.cpp	Sat Nov  8 12:24:47 2003
@@ -16,24 +16,26 @@
 using std::vector;
 
 // Global symbols added to the program by the opt -emitfuncs pass:
-extern void** llvmFunctionTable[];
+extern void **llvmFunctionTable[];
 extern char llvmSimpleFunction[];
 extern int llvmFunctionCount;
 // Global symbols added to the program by FunctionInfo pass:
-extern unsigned char* FunctionBB[];
-extern unsigned char* FunctionLI[];
+extern unsigned char *FunctionBB[];
+extern unsigned char *FunctionLI[];
 
-static map > BBmapF;
+static std::map > BBmapF;
 //reverse of BBMAP
-static map BBmapReverse;
-static map/*MI*/ > > MImapF; 
-static map revFunction;
-static map > BBMapFwd;
-static map FunctionInlinable;
-
-static void createBBmapF(unsigned char *BBinfo, unsigned length);
-static void createMImapF(unsigned char *LMIinfo, unsigned length);
-static void createBBmapRevFwdF(Module *M);
+static std::map BBmapReverse;
+static std::map/*MI*/ > > MImapF; 
+static std::map revFunction;
+static std::map > BBMapFwd;
+static std::map FunctionInlinable;
+
+// Tables we use to look up Instructions and Functions in the mapping
+// info for the current Module:
+static std::map FunctionKey;
+static std::map BasicBlockKey;
+static std::map llvmInstructionKey;
 
 /// readNumber - Read in a 32-bit number from the beginning of BBinfo,
 /// decoding it from the compressed encoding in which the mapping
@@ -50,21 +52,7 @@
   return Val + (*BBinfo++ << Shift);
 }
 
-/// getLLVMInstrPositionInfo - Look up the given Instruction in the
-/// LLVM-to-MI map for the Function that contains it, and return the
-/// vector of integers (?) that represents it.
-///
-vector getLLVMInstrPositionInfo(Instruction *LI){
-  // Get pointers to the BasicBlock, Function, and Module which contain LI.
-  BasicBlock *BB = LI->getParent();
-  Function *F = BB->getParent();
-  Module *M = F->getParent();
-
-  // Tables we use to look up Instructions for the current Module:
-  static map FunctionKey;
-  static map BasicBlockKey;
-  static map llvmInstructionKey;
-
+static void maybeFillInMapsForModule (Module *M) {
   // First time we see a given Module, we have to fill in the above tables.
   static Module *lastUsedModule = NULL;
   if (lastUsedModule != M) {
@@ -86,6 +74,37 @@
     }
     lastUsedModule = M;
   }
+}
+
+/// Returns the index in _llvm_regAllocState.functions[] where F's register
+/// allocation data may be found. It is a runtime error to call this on a
+/// function which was recently added to the module.
+///
+unsigned getLLVMFunctionPositionInfo (Function *F) {
+  // Get pointer to the Module which contains F
+  Module *M = F->getParent ();
+
+  maybeFillInMapsForModule (M);
+  
+  assert (FunctionKey.find (F) != FunctionKey.end ());
+  return FunctionKey[F];
+}
+
+static void createBBmapF(unsigned char *BBinfo, unsigned length);
+static void createMImapF(unsigned char *LMIinfo, unsigned length);
+static void createBBmapRevFwdF(Module *M);
+
+/// getLLVMInstrPositionInfo - Look up the given Instruction in the
+/// LLVM-to-MI map for the Function that contains it, and return the
+/// vector of integers (?) that represents it.
+///
+std::vector getLLVMInstrPositionInfo (Instruction *LI) {
+  // Get pointers to the BasicBlock, Function, and Module which contain LI.
+  BasicBlock *BB = LI->getParent();
+  Function *F = BB->getParent();
+  Module *M = F->getParent();
+
+  maybeFillInMapsForModule (M);
 
   unsigned FunctionNo = FunctionKey[F];
   static unsigned lastUsedFunctionNo = ~0;




From gaeke at cs.uiuc.edu  Sat Nov  8 13:09:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat Nov  8 13:09:01 2003
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200311081908.NAA17860@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.17 -> 1.18

---
Log message:

Arbitrarily pick a standard temporary register for spill-to-spill moves.

Move getSavedStateIndexOfFunction() to live with the other MappingInfo stuff
so that it can share code. Rename it to getLLVMFunctionPositionInfo().


---
Diffs of the changes:  (+8 -28)

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.17 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.18
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.17	Fri Nov  7 16:03:26 2003
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Sat Nov  8 13:08:33 2003
@@ -58,10 +58,13 @@
                      RegType);
   } else if (Source.AllocState == AllocInfo::Spilled
              && Target.AllocState == AllocInfo::Spilled) {
-    // Emit load instruction from address in SrcReg into register SrcReg
-    TRI.cpMem2RegMI (mvec, FramePtrReg, Source.Placement, SrcReg, RegType);
-    // Emit store instruction from register SrcReg to stack loc. Target
-    TRI.cpReg2MemMI (mvec, SrcReg, FramePtrReg, Target.Placement, RegType);
+    const unsigned TempReg = 
+      getUnifiedRegNum(UltraSparcRegInfo::IntRegClassID,
+                       SparcIntRegClass::g1); // just pick one?
+    // Emit load instruction from stack loc. Source into register TempReg
+    TRI.cpMem2RegMI (mvec, FramePtrReg, Source.Placement, TempReg, RegType);
+    // Emit store instruction from register TempReg to stack loc. Target
+    TRI.cpReg2MemMI (mvec, TempReg, FramePtrReg, Target.Placement, RegType);
   }
   // Add whatever the TargetRegInfo gave us to the MachineBasicBlock we were
   // provided.
@@ -157,29 +160,6 @@
 
 extern PhyRegAlloc::SavedStateMapTy ExportedFnAllocState;
 
-/// Returns the index in _llvm_regAllocState.functions[] where F's register
-/// allocation data may be found.
-///
-/// FIXME: This is basically the same as Anand's FunctionKey[] in
-/// getLLVMinfo.cpp; merge the two!
-///
-unsigned getSavedStateIndexOfFunction (Function *F) {
-  unsigned Key = 0;
-  Module *M = F->getParent ();
-  for (Module::iterator I = M->begin (), E = M->end (); I != E; ++I) {
-    Function *FI = I;
-    if (FI->isExternal ()) continue;
-    if (FI == F) return Key;
-    ++Key;
-  }
-  // By this time we had better have found it, otherwise we are about to do bad
-  // things.
-  std::cerr << "ERROR: UnpackTraceFunction: Cannot find index of Function "
-            << F->getName() << "() in its parent Module, in "
-            << "getSavedStateIndexOfFunction()\n";
-  abort ();
-}
-
 unsigned getSavedStateIndexOfInstruction (const Function *F,
                                           const Instruction *I) {
   unsigned Key = 0;
@@ -210,7 +190,7 @@
   // Figure out the indices (FI, VI, VO) that can be used to look up V, which
   // is an operand of some instruction in F, in _llvm_regAllocState:
   Instruction *Instr = cast (V);
-  unsigned FI = getSavedStateIndexOfFunction (F);
+  unsigned FI = getLLVMFunctionPositionInfo (F);
   unsigned VI = getSavedStateIndexOfInstruction (F, Instr);
   unsigned VO = getSavedStateIndexOfOperandInInstruction (F, V, VI);
   // Reconstruct the AllocInfo for V by searching




From lattner at cs.uiuc.edu  Sat Nov  8 14:34:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 14:34:00 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.gnuplot
Message-ID: <200311082033.OAA00792@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.gnuplot updated: 1.5 -> 1.6

---
Log message:

Since we are collecting all of this data, we might as well graph it!


---
Diffs of the changes:  (+202 -3)

Index: llvm/utils/NightlyTest.gnuplot
diff -u llvm/utils/NightlyTest.gnuplot:1.5 llvm/utils/NightlyTest.gnuplot:1.6
--- llvm/utils/NightlyTest.gnuplot:1.5	Sat Aug 23 18:16:37 2003
+++ llvm/utils/NightlyTest.gnuplot	Sat Nov  8 14:33:04 2003
@@ -2,8 +2,8 @@
 
 ##------- Plot small Date vs LOC ----
 set output "running_loc.png"
-set xlabel "Date" "TimesRoman,24"
-set ylabel "Lines of Code" "TimesRoman,24"
+set xlabel "Date" 
+set ylabel "Lines of Code"
 set xdata time
 set timefmt "%Y-%m-%d:"
 set format x "%b %d, %Y"
@@ -16,7 +16,7 @@
 set label "Reoptimizer\n removal" at "2003-08-10:", 132000
 
 set size .75,.75
-plot "running_loc.txt" using 1:2 title '', \
+plot "running_loc.txt" using 1:2 title '' with lines, \
      "running_loc.txt" using 1:2 title "Date vs. Lines of Code" with lines
 
 ##------- Plot large Date vs LOC ----
@@ -29,4 +29,203 @@
 # Delete all labels...
 set nolabel
 
+##------- Olden CBE performance ----
+
+set size .75,.75
+set output "running_Olden_cbe_time.png"
+set ylabel "CBE compiled execution time"
+plot "running_Olden_cbe_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_cbe_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_cbe_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_cbe_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_cbe_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_cbe_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_cbe_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_cbe_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_cbe_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_cbe_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_cbe_time.txt" u 1:11 t "voronoi" \
+   with lines
+
+set size 1.5,1.5
+set output "running_Olden_cbe_time_large.png"
+plot "running_Olden_cbe_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_cbe_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_cbe_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_cbe_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_cbe_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_cbe_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_cbe_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_cbe_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_cbe_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_cbe_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_cbe_time.txt" u 1:11 t "voronoi" \
+   with lines
+
+##------- Olden JIT performance ----
+
+set size .75,.75
+set output "running_Olden_jit_time.png"
+set ylabel "JIT execution time"
+plot "running_Olden_jit_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_jit_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_jit_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_jit_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_jit_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_jit_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_jit_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_jit_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_jit_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_jit_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_jit_time.txt" u 1:11 t "voronoi" \
+   with lines
+
+set size 1.5,1.5
+set output "running_Olden_jit_time_large.png"
+plot "running_Olden_jit_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_jit_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_jit_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_jit_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_jit_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_jit_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_jit_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_jit_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_jit_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_jit_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_jit_time.txt" u 1:11 t "voronoi" \
+   with lines
+
+##------- Olden LLC performance ----
+
+set size .75,.75
+set output "running_Olden_llc_time.png"
+set ylabel "LLC compiled execution time"
+plot "running_Olden_llc_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_llc_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_llc_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_llc_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_llc_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_llc_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_llc_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_llc_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_llc_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_llc_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_llc_time.txt" u 1:11 t "voronoi" \
+   with lines
+
+set size 1.5,1.5
+set output "running_Olden_llc_time_large.png"
+plot "running_Olden_llc_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_llc_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_llc_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_llc_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_llc_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_llc_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_llc_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_llc_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_llc_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_llc_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_llc_time.txt" u 1:11 t "voronoi" \
+   with lines
+
 
+##------- Olden optimizer time ----
+
+set size .75,.75
+set output "running_Olden_opt_time.png"
+set ylabel "Time to run the optimizer"
+plot "running_Olden_opt_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_opt_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_opt_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_opt_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_opt_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_opt_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_opt_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_opt_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_opt_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_opt_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_opt_time.txt" u 1:11 t "voronoi" \
+   with lines
+
+set size 1.5,1.5
+set output "running_Olden_opt_time_large.png"
+plot "running_Olden_opt_time.txt" u 1:2 t '' with lines, \
+     "running_Olden_opt_time.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_opt_time.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_opt_time.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_opt_time.txt" u 1:5 t "health" with lines, \
+     "running_Olden_opt_time.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_opt_time.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_opt_time.txt" u 1:8 t "power" with lines, \
+     "running_Olden_opt_time.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_opt_time.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_opt_time.txt" u 1:11 t "voronoi" \
+   with lines
+
+
+##------- Machine code size ----
+
+set size .75,.75
+set output "running_Olden_machcode.png"
+set ylabel "Program machine code size"
+plot "running_Olden_machcode.txt" u 1:2 t '' with lines, \
+     "running_Olden_machcode.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_machcode.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_machcode.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_machcode.txt" u 1:5 t "health" with lines, \
+     "running_Olden_machcode.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_machcode.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_machcode.txt" u 1:8 t "power" with lines, \
+     "running_Olden_machcode.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_machcode.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_machcode.txt" u 1:11 t "voronoi" \
+   with lines
+
+set size 1.5,1.5
+set output "running_Olden_machcode_large.png"
+plot "running_Olden_machcode.txt" u 1:2 t '' with lines, \
+     "running_Olden_machcode.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_machcode.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_machcode.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_machcode.txt" u 1:5 t "health" with lines, \
+     "running_Olden_machcode.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_machcode.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_machcode.txt" u 1:8 t "power" with lines, \
+     "running_Olden_machcode.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_machcode.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_machcode.txt" u 1:11 t "voronoi" \
+   with lines
+
+
+##------- Bytecode size ----
+
+set size .75,.75
+set output "running_Olden_bytecode.png"
+set ylabel "Program bytecode size"
+plot "running_Olden_bytecode.txt" u 1:2 t '' with lines, \
+     "running_Olden_bytecode.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_bytecode.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_bytecode.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_bytecode.txt" u 1:5 t "health" with lines, \
+     "running_Olden_bytecode.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_bytecode.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_bytecode.txt" u 1:8 t "power" with lines, \
+     "running_Olden_bytecode.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_bytecode.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_bytecode.txt" u 1:11 t "voronoi" \
+   with lines
+
+set size 1.5,1.5
+set output "running_Olden_bytecode_large.png"
+plot "running_Olden_bytecode.txt" u 1:2 t '' with lines, \
+     "running_Olden_bytecode.txt" u 1:2 t "bh" with lines, \
+     "running_Olden_bytecode.txt" u 1:3 t "bisort" with lines, \
+     "running_Olden_bytecode.txt" u 1:4 t "em3d" with lines, \
+     "running_Olden_bytecode.txt" u 1:5 t "health" with lines, \
+     "running_Olden_bytecode.txt" u 1:6 t "mst" with lines, \
+     "running_Olden_bytecode.txt" u 1:7 t "perimeter" with lines, \
+     "running_Olden_bytecode.txt" u 1:8 t "power" with lines, \
+     "running_Olden_bytecode.txt" u 1:9 t "treeadd" with lines, \
+     "running_Olden_bytecode.txt" u 1:10 t "tsp" with lines, \
+     "running_Olden_bytecode.txt" u 1:11 t "voronoi" \
+   with lines




From lattner at cs.uiuc.edu  Sat Nov  8 14:49:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 14:49:01 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.gnuplot NightlyTestTemplate.html
Message-ID: <200311082048.OAA00861@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.gnuplot updated: 1.6 -> 1.7
NightlyTestTemplate.html updated: 1.21 -> 1.22

---
Log message:

* Add units to the yaxis of each chart
* Add charts to the nightly test report


---
Diffs of the changes:  (+56 -14)

Index: llvm/utils/NightlyTest.gnuplot
diff -u llvm/utils/NightlyTest.gnuplot:1.6 llvm/utils/NightlyTest.gnuplot:1.7
--- llvm/utils/NightlyTest.gnuplot:1.6	Sat Nov  8 14:33:04 2003
+++ llvm/utils/NightlyTest.gnuplot	Sat Nov  8 14:48:39 2003
@@ -33,7 +33,7 @@
 
 set size .75,.75
 set output "running_Olden_cbe_time.png"
-set ylabel "CBE compiled execution time"
+set ylabel "CBE compiled execution time (s)"
 plot "running_Olden_cbe_time.txt" u 1:2 t '' with lines, \
      "running_Olden_cbe_time.txt" u 1:2 t "bh" with lines, \
      "running_Olden_cbe_time.txt" u 1:3 t "bisort" with lines, \
@@ -66,7 +66,7 @@
 
 set size .75,.75
 set output "running_Olden_jit_time.png"
-set ylabel "JIT execution time"
+set ylabel "JIT execution time (s)"
 plot "running_Olden_jit_time.txt" u 1:2 t '' with lines, \
      "running_Olden_jit_time.txt" u 1:2 t "bh" with lines, \
      "running_Olden_jit_time.txt" u 1:3 t "bisort" with lines, \
@@ -99,7 +99,7 @@
 
 set size .75,.75
 set output "running_Olden_llc_time.png"
-set ylabel "LLC compiled execution time"
+set ylabel "LLC compiled execution time (s)"
 plot "running_Olden_llc_time.txt" u 1:2 t '' with lines, \
      "running_Olden_llc_time.txt" u 1:2 t "bh" with lines, \
      "running_Olden_llc_time.txt" u 1:3 t "bisort" with lines, \
@@ -133,7 +133,7 @@
 
 set size .75,.75
 set output "running_Olden_opt_time.png"
-set ylabel "Time to run the optimizer"
+set ylabel "Time to run the optimizer (s)"
 plot "running_Olden_opt_time.txt" u 1:2 t '' with lines, \
      "running_Olden_opt_time.txt" u 1:2 t "bh" with lines, \
      "running_Olden_opt_time.txt" u 1:3 t "bisort" with lines, \
@@ -167,7 +167,7 @@
 
 set size .75,.75
 set output "running_Olden_machcode.png"
-set ylabel "Program machine code size"
+set ylabel "Program machine code size (bytes)"
 plot "running_Olden_machcode.txt" u 1:2 t '' with lines, \
      "running_Olden_machcode.txt" u 1:2 t "bh" with lines, \
      "running_Olden_machcode.txt" u 1:3 t "bisort" with lines, \
@@ -201,7 +201,7 @@
 
 set size .75,.75
 set output "running_Olden_bytecode.png"
-set ylabel "Program bytecode size"
+set ylabel "Program bytecode size (bytes)"
 plot "running_Olden_bytecode.txt" u 1:2 t '' with lines, \
      "running_Olden_bytecode.txt" u 1:2 t "bh" with lines, \
      "running_Olden_bytecode.txt" u 1:3 t "bisort" with lines, \


Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.21 llvm/utils/NightlyTestTemplate.html:1.22
--- llvm/utils/NightlyTestTemplate.html:1.21	Wed Oct  8 00:09:52 2003
+++ llvm/utils/NightlyTestTemplate.html	Sat Nov  8 14:48:39 2003
@@ -110,14 +110,56 @@
 Changes over Time
 

 
-GNUplot charts showing a couple of things:
-

-Compile Time
-
Testing Time
-
Time to run some programs, say all of Olden
-
Time to compile something, say Olden.
-
Size of bytecode files for Olden
-

+
+Here are some charts showing how the LLVM optimizer and code generators are
+changing over time.  For now we use the Olden benchmark suite to measure this,
+but eventually we will switch to using SPEC CPU2000.  All programs are run with
+"LARGE_PROBLEM_SIZE" enabled.  Click on any of the charts to get a larger
+version.
+
+
Compilation Measurements:
+
+
+
+
+
+
+
+
+
+

+Size of LLVM bytecode files
+ 
+

+Size of native machine code for each program (generated by the JIT)
+

+

+Time to run the LLVM optimizer on each program
+ 
+
+Program Execution Measurements:
+
+
+
+
+
+
+
+
+
+
+

+Execution time for CBE generated executable
+ 
+

+Execution time for the LLC generated executable
+

+

+Execution time for program in the JIT
+ 
+
+
+
 
 


  




From lattner at cs.uiuc.edu  Sat Nov  8 15:18:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 15:18:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
Message-ID: <200311082117.PAA01681@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/DataStructure:

TopDownClosure.cpp updated: 1.57 -> 1.58

---
Log message:

This doesn't use DSCallSiteIterator


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.57 llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.58
--- llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.57	Mon Oct 20 14:43:06 2003
+++ llvm/lib/Analysis/DataStructure/TopDownClosure.cpp	Sat Nov  8 15:17:37 2003
@@ -17,9 +17,9 @@
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Module.h"
 #include "llvm/DerivedTypes.h"
+#include "llvm/Analysis/DSGraph.h"
 #include "Support/Debug.h"
 #include "Support/Statistic.h"
-#include "DSCallSiteIterator.h"
 
 namespace {
   RegisterAnalysis   // Register the pass




From lattner at cs.uiuc.edu  Sat Nov  8 15:24:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 15:24:01 2003
Subject: [llvm-commits] CVS: llvm/Makefile.rules
Message-ID: <200311082123.PAA03356@zion.cs.uiuc.edu>


Changes in directory llvm:

Makefile.rules updated: 1.155 -> 1.156

---
Log message:

Fix broken makefile dependency generation


---
Diffs of the changes:  (+2 -2)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.155 llvm/Makefile.rules:1.156
--- llvm/Makefile.rules:1.155	Thu Nov  6 22:39:53 2003
+++ llvm/Makefile.rules	Sat Nov  8 15:23:06 2003
@@ -800,11 +800,11 @@
 
 # Create dependencies for the *.cpp files...
 $(BUILD_OBJ_DIR)/Depend/%.d: %.cpp $(BUILD_OBJ_DIR)/Depend/.dir
-	$(VERB) $(Depend) $< | $(SED) 's|\.o$$|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
+	$(VERB) $(Depend) $< | $(SED) 's|\.o:|\.lo:|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
 
 # Create dependencies for the *.c files...
 $(BUILD_OBJ_DIR)/Depend/%.d: %.c $(BUILD_OBJ_DIR)/Depend/.dir
-	$(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o$$|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
+	$(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o:|\.lo:|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
 
 #
 # Autoconf Dependencies.




From lattner at cs.uiuc.edu  Sat Nov  8 15:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 15:57:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h Local.cpp
Message-ID: <200311082156.PAA22318@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/DataStructure:

DSCallSiteIterator.h updated: 1.6 -> 1.7
Local.cpp updated: 1.67 -> 1.68

---
Log message:

Handle bzero and memset in the local analysis, because we were missing the fact
that memset returns its argument!!


---
Diffs of the changes:  (+17 -4)

Index: llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h
diff -u llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h:1.6 llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h:1.7
--- llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h:1.6	Tue Oct 21 10:17:09 2003
+++ llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h	Sat Nov  8 15:55:50 2003
@@ -39,8 +39,7 @@
     return F->getName() == "printf"  || F->getName() == "sscanf" ||
       F->getName() == "fprintf" || F->getName() == "open" ||
       F->getName() == "sprintf" || F->getName() == "fputs" ||
-      F->getName() == "fscanf" || F->getName() == "bzero" ||
-      F->getName() == "memset";
+      F->getName() == "fscanf";
   }
 
   // isUnresolvableFunction - Return true if this is an unresolvable


Index: llvm/lib/Analysis/DataStructure/Local.cpp
diff -u llvm/lib/Analysis/DataStructure/Local.cpp:1.67 llvm/lib/Analysis/DataStructure/Local.cpp:1.68
--- llvm/lib/Analysis/DataStructure/Local.cpp:1.67	Sun Nov  2 16:27:28 2003
+++ llvm/lib/Analysis/DataStructure/Local.cpp	Sat Nov  8 15:55:50 2003
@@ -435,8 +435,22 @@
       } else if (F->getName() == "realloc") {
         DSNodeHandle RetNH = getValueDest(*CS.getInstruction());
         RetNH.mergeWith(getValueDest(**CS.arg_begin()));
-        DSNode *N = RetNH.getNode();
-        if (N) N->setHeapNodeMarker()->setModifiedMarker()->setReadMarker();
+        if (DSNode *N = RetNH.getNode())
+          N->setHeapNodeMarker()->setModifiedMarker()->setReadMarker();
+        return;
+      } else if (F->getName() == "memset") {
+        // Merge the first argument with the return value, and mark the memory
+        // modified.
+        DSNodeHandle RetNH = getValueDest(*CS.getInstruction());
+        RetNH.mergeWith(getValueDest(**CS.arg_begin()));
+        if (DSNode *N = RetNH.getNode())
+          N->setModifiedMarker();
+        return;
+      } else if (F->getName() == "bzero") {
+        // Mark the memory modified.
+        DSNodeHandle H = getValueDest(**CS.arg_begin());
+        if (DSNode *N = H.getNode())
+          N->setModifiedMarker();
         return;
       }
 




From lattner at cs.uiuc.edu  Sat Nov  8 16:38:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 16:38:02 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200311082237.QAA03796@zion.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.31 -> 1.32

---
Log message:

Eliminate the poolarrayalloc function, by always passing the size into the 
runtime library.  Also simplify and cleanup some code.


---
Diffs of the changes:  (+22 -34)

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.31 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.32
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.31	Fri Nov  7 12:40:04 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Sat Nov  8 16:36:55 2003
@@ -185,35 +185,21 @@
   CurModule->addTypeName("PoolDescriptor", PoolDescType);
   
   // Get poolinit function...
-  FunctionType *PoolInitTy =
-    FunctionType::get(Type::VoidTy,
-                      make_vector(PoolDescPtr, Type::UIntTy, 0),
-                      false);
-  PoolInit = CurModule->getOrInsertFunction("poolinit", PoolInitTy);
+  PoolInit = CurModule->getOrInsertFunction("poolinit", Type::VoidTy,
+                                            PoolDescPtr, Type::UIntTy, 0);
 
   // Get pooldestroy function...
-  std::vector PDArgs(1, PoolDescPtr);
-  FunctionType *PoolDestroyTy =
-    FunctionType::get(Type::VoidTy, PDArgs, false);
-  PoolDestroy = CurModule->getOrInsertFunction("pooldestroy", PoolDestroyTy);
-  
-  // Get the poolalloc function...
-  FunctionType *PoolAllocTy = FunctionType::get(VoidPtrTy, PDArgs, false);
-  PoolAlloc = CurModule->getOrInsertFunction("poolalloc", PoolAllocTy);
+  PoolDestroy = CurModule->getOrInsertFunction("pooldestroy", Type::VoidTy,
+                                               PoolDescPtr, 0);
   
-  // Get the poolfree function...
-  PDArgs.push_back(VoidPtrTy);       // Pointer to free
-  FunctionType *PoolFreeTy = FunctionType::get(Type::VoidTy, PDArgs, false);
-  PoolFree = CurModule->getOrInsertFunction("poolfree", PoolFreeTy);
-  
-  // The poolallocarray function
-  FunctionType *PoolAllocArrayTy =
-    FunctionType::get(VoidPtrTy,
-                      make_vector(PoolDescPtr, Type::UIntTy, 0),
-                      false);
-  PoolAllocArray = CurModule->getOrInsertFunction("poolallocarray", 
-						  PoolAllocArrayTy);
+  // The poolalloc function
+  PoolAlloc = CurModule->getOrInsertFunction("poolalloc", 
+                                             VoidPtrTy, PoolDescPtr,
+                                             Type::UIntTy, 0);
   
+  // Get the poolfree function...
+  PoolFree = CurModule->getOrInsertFunction("poolfree", Type::VoidTy,
+                                            PoolDescPtr, VoidPtrTy, 0);  
 }
 
 // Inline the DSGraphs of functions corresponding to the potential targets at
@@ -572,7 +558,7 @@
 		<< ". All Data Structures may not be pool allocated\n");
       ElSize = ConstantUInt::get(Type::UIntTy, 0);
     }
-	
+    
     // Insert the call to initialize the pool...
     new CallInst(PoolInit, make_vector(AI, ElSize, 0), "", InsertPoint);
     ++NumPools;
@@ -838,20 +824,22 @@
   std::string Name = MI.getName(); MI.setName("");
 
   // Insert a call to poolalloc
-  Value *V;
-  if (MI.isArrayAllocation()) 
-    V = new CallInst(PAInfo.PoolAllocArray, make_vector(PH, MI.getOperand(0),0),
-		     Name, &MI);
-  else
-    V = new CallInst(PAInfo.PoolAlloc, make_vector(PH, 0), Name, &MI);
+  TargetData &TD = PAInfo.getAnalysis();
+  Value *AllocSize =
+    ConstantUInt::get(Type::UIntTy, TD.getTypeSize(MI.getAllocatedType()));
+
+  if (MI.isArrayAllocation())
+    AllocSize = BinaryOperator::create(Instruction::Mul, AllocSize,
+                                       MI.getOperand(0), "sizetmp", &MI);
+
+  Value *V = new CallInst(PAInfo.PoolAlloc, make_vector(PH, AllocSize, 0),
+                          Name, &MI);
 
   const Type *phtype = MI.getType()->getElementType();
   std::map &PoolDescType = FI.PoolDescType;
   if (!PoolDescType.count(PH))
     PoolDescType[PH] = phtype;
 
-  MI.setName("");  // Nuke MIs name
-  
   Value *Casted = V;
 
   // Cast to the appropriate type if necessary




From gaeke at cs.uiuc.edu  Sat Nov  8 16:43:00 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat Nov  8 16:43:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/DiffOutput.sh
Message-ID: <200311082242.QAA04423@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

DiffOutput.sh updated: 1.12 -> 1.13

---
Log message:

Don't pick 'gdiff' to diff unless 'which' hands us back something
which really is an executable. :-\


---
Diffs of the changes:  (+7 -3)

Index: llvm/test/Programs/DiffOutput.sh
diff -u llvm/test/Programs/DiffOutput.sh:1.12 llvm/test/Programs/DiffOutput.sh:1.13
--- llvm/test/Programs/DiffOutput.sh:1.12	Sun Jun 22 15:21:04 2003
+++ llvm/test/Programs/DiffOutput.sh	Sat Nov  8 16:42:32 2003
@@ -12,11 +12,15 @@
 DIFFOUTPUT=Output/$2.diff-$1
 
 # Find gnu diff
+
+DIFF=diff
 if which gdiff > /dev/null 2>&1
 then
-  DIFF=gdiff
-else
-  DIFF=diff
+  where=`which gdiff 2>&1`
+  if [ -x "$where" ]
+  then
+    DIFF=gdiff
+  fi
 fi
 
 # Diff the two files.




From lattner at cs.uiuc.edu  Sat Nov  8 16:46:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 16:46:01 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/PoolAllocator.h PoolAllocatorBitMask.cpp
Message-ID: <200311082245.QAA04484@zion.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

PoolAllocator.h updated: 1.4 -> 1.5
PoolAllocatorBitMask.cpp updated: 1.27 -> 1.28

---
Log message:

Change interface to the pool allocator to take the number of bytes allocated,
not the number of nodes.  Also eliminate poolallocarray from the public
pool allocator itf


---
Diffs of the changes:  (+45 -38)

Index: poolalloc/runtime/PoolAllocator/PoolAllocator.h
diff -u poolalloc/runtime/PoolAllocator/PoolAllocator.h:1.4 poolalloc/runtime/PoolAllocator/PoolAllocator.h:1.5
--- poolalloc/runtime/PoolAllocator/PoolAllocator.h:1.4	Sun Oct 26 17:27:31 2003
+++ poolalloc/runtime/PoolAllocator/PoolAllocator.h	Sat Nov  8 16:44:59 2003
@@ -32,9 +32,8 @@
   void poolinit(PoolTy *Pool, unsigned NodeSize);
   void poolmakeunfreeable(PoolTy *Pool);
   void pooldestroy(PoolTy *Pool);
-  void *poolalloc(PoolTy *Pool);
+  void *poolalloc(PoolTy *Pool, unsigned NumBytes);
   void poolfree(PoolTy *Pool, void *Node);
-  void* poolallocarray(PoolTy* Pool, unsigned Size);
 }
 
 #endif


Index: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
diff -u poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.27 poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.28
--- poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.27	Sat Nov  8 01:22:19 2003
+++ poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp	Sat Nov  8 16:44:59 2003
@@ -161,7 +161,7 @@
   int containsElement(void *Ptr, unsigned ElementSize) const;
 
   // freeElement - Free the single node, small array, or entire array indicated.
-  void freeElement(unsigned ElementIdx);
+  void freeElement(unsigned short ElementIdx);
   
   // lastNodeAllocated - Return one past the last node in the pool which is
   // before ScanIdx, that is allocated.  If there are no allocated nodes in this
@@ -345,7 +345,7 @@
 
 
 // freeElement - Free the single node, small array, or entire array indicated.
-void PoolSlab::freeElement(unsigned ElementIdx) {
+void PoolSlab::freeElement(unsigned short ElementIdx) {
   assert(isNodeAllocated(ElementIdx) &&
          "poolfree: Attempt to free node that is already freed\n");
 
@@ -369,10 +369,10 @@
   markNodeFree(ElementIdx);
   
   // Free all nodes if this was a small array allocation.
-  unsigned ElementEndIdx = ElementIdx + 1;
+  unsigned short ElementEndIdx = ElementIdx + 1;
 
   // FIXME: This should use manual strength reduction to produce decent code.
-  unsigned UE = UsedEnd;
+  unsigned short UE = UsedEnd;
   while (ElementEndIdx != UE &&
          !isStartOfAllocation(ElementEndIdx) && 
          isNodeAllocated(ElementEndIdx)) {
@@ -514,9 +514,46 @@
   }
 }
 
-void *poolalloc(PoolTy *Pool) {
+
+// poolallocarray - a helper function used to implement poolalloc, when the
+// number of nodes to allocate is not 1.
+static void *poolallocarray(PoolTy* Pool, unsigned Size) {
+  assert(Pool && "Null pool pointer passed into poolallocarray!\n");
+  if (Size > PoolSlab::getSlabSize(Pool))
+    return PoolSlab::createSingleArray(Pool, Size);    
+
+  PoolSlab *PS = (PoolSlab*)Pool->Ptr1;
+
+  // Loop through all of the slabs looking for one with an opening
+  for (; PS; PS = PS->Next) {
+    int Element = PS->allocateMultiple(Size);
+    if (Element != -1) {
+      // We allocated an element.  Check to see if this slab has been completely
+      // filled up.  If so, move it to the Ptr2 list.
+      if (PS->isFull()) {
+        PS->unlinkFromList();
+        PS->addToList((PoolSlab**)&Pool->Ptr2);
+      }
+      return PS->getElementAddress(Element, Pool->NodeSize);
+    }
+  }
+  
+  PoolSlab *New = PoolSlab::create(Pool);
+  int Idx = New->allocateMultiple(Size);
+  assert(Idx == 0 && "New allocation didn't return zero'th node?");
+  return New->getElementAddress(0, 0);
+}
+
+void *poolalloc(PoolTy *Pool, unsigned NumBytes) {
   assert(Pool && "Null pool pointer passed in to poolalloc!\n");
 
+  unsigned NodeSize = Pool->NodeSize;
+  unsigned NodesToAllocate = (NumBytes+NodeSize-1)/NodeSize;
+  if (NodesToAllocate > 1)
+    return poolallocarray(Pool, NodesToAllocate);
+
+  // Special case the most common situation, where a single node is being
+  // allocated.
   PoolSlab *PS = (PoolSlab*)Pool->Ptr1;
 
   if (__builtin_expect(PS != 0, 1)) {
@@ -529,7 +566,7 @@
         PS->addToList((PoolSlab**)&Pool->Ptr2);
       }
       
-      return PS->getElementAddress(Element, Pool->NodeSize);
+      return PS->getElementAddress(Element, NodeSize);
     }
 
     // Loop through all of the slabs looking for one with an opening
@@ -543,7 +580,7 @@
           PS->addToList((PoolSlab**)&Pool->Ptr2);
         }
         
-        return PS->getElementAddress(Element, Pool->NodeSize);
+        return PS->getElementAddress(Element, NodeSize);
       }
     }
   }
@@ -555,36 +592,7 @@
   return New->getElementAddress(0, 0);
 }
 
-void *poolallocarray(PoolTy* Pool, unsigned Size) {
-  assert(Pool && "Null pool pointer passed into poolallocarray!\n");
-
-  // Special case size=1, because poolalloc is much faster than this function.
-  if (Size == 1 || Size == 0)
-    return poolalloc(Pool);
-  if (Size > PoolSlab::getSlabSize(Pool))
-    return PoolSlab::createSingleArray(Pool, Size);    
-
-  PoolSlab *PS = (PoolSlab*)Pool->Ptr1;
 
-  // Loop through all of the slabs looking for one with an opening
-  for (; PS; PS = PS->Next) {
-    int Element = PS->allocateMultiple(Size);
-    if (Element != -1) {
-      // We allocated an element.  Check to see if this slab has been completely
-      // filled up.  If so, move it to the Ptr2 list.
-      if (PS->isFull()) {
-        PS->unlinkFromList();
-        PS->addToList((PoolSlab**)&Pool->Ptr2);
-      }
-      return PS->getElementAddress(Element, Pool->NodeSize);
-    }
-  }
-  
-  PoolSlab *New = PoolSlab::create(Pool);
-  int Idx = New->allocateMultiple(Size);
-  assert(Idx == 0 && "New allocation didn't return zero'th node?");
-  return New->getElementAddress(0, 0);
-}
 
 // SearchForContainingSlab - Do a brute force search through the list of
 // allocated slabs for the node in question.




From lattner at cs.uiuc.edu  Sat Nov  8 17:02:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 17:02:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/C++Frontend/2003-11-08-ArrayAddress.cpp.tr
Message-ID: <200311082300.RAA04725@zion.cs.uiuc.edu>


Changes in directory llvm/test/Regression/C++Frontend:

2003-11-08-ArrayAddress.cpp.tr added (r1.1)

---
Log message:

new testcase


---
Diffs of the changes:  (+10 -0)

Index: llvm/test/Regression/C++Frontend/2003-11-08-ArrayAddress.cpp.tr
diff -c /dev/null llvm/test/Regression/C++Frontend/2003-11-08-ArrayAddress.cpp.tr:1.1
*** /dev/null	Sat Nov  8 17:00:59 2003
--- llvm/test/Regression/C++Frontend/2003-11-08-ArrayAddress.cpp.tr	Sat Nov  8 17:00:49 2003
***************
*** 0 ****
--- 1,10 ----
+ // RUN: %llvmg++ -xc++ %s -c -o - | llvm-dis | grep getelementptr
+ 
+ struct foo {
+   int array[100];
+   void *getAddr(unsigned i);
+ };
+ 
+ void *foo::getAddr(unsigned i) {
+   return &array[i];
+ }




From gaeke at cs.uiuc.edu  Sat Nov  8 17:17:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat Nov  8 17:17:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c
Message-ID: <200311082316.RAA05039@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp:

Looping.c updated: 1.1 -> 1.2

---
Log message:

This benchmark is not guaranteed to terminate unless 'i' is volatile.


---
Diffs of the changes:  (+1 -1)

Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c
diff -u llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c:1.1 llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c:1.2
--- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c:1.1	Thu Sep 11 14:06:43 2003
+++ llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c	Sat Nov  8 17:16:15 2003
@@ -4,7 +4,7 @@
 int main()
 {
   jmp_buf buf;
-  unsigned i = 0;
+  volatile unsigned i = 0;
 
   if (setjmp(buf) < 10) {
     printf("i == %u\n", i);




From lattner at cs.uiuc.edu  Sat Nov  8 18:24:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 18:24:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/CFrontend/2003-11-08-PointerSubNotGetelementptr.c.tr 2003-11-04-EmptyStruct.c
Message-ID: <200311090023.SAA01464@zion.cs.uiuc.edu>


Changes in directory llvm/test/Regression/CFrontend:

2003-11-08-PointerSubNotGetelementptr.c.tr added (r1.1)
2003-11-04-EmptyStruct.c updated: 1.1 -> 1.2

---
Log message:

new testcase


---
Diffs of the changes:  (+9 -1)

Index: llvm/test/Regression/CFrontend/2003-11-08-PointerSubNotGetelementptr.c.tr
diff -c /dev/null llvm/test/Regression/CFrontend/2003-11-08-PointerSubNotGetelementptr.c.tr:1.1
*** /dev/null	Sat Nov  8 18:23:16 2003
--- llvm/test/Regression/CFrontend/2003-11-08-PointerSubNotGetelementptr.c.tr	Sat Nov  8 18:23:05 2003
***************
*** 0 ****
--- 1,9 ----
+ // RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep getelementptr
+ 
+ char *test(char* C) {
+   return C-1;   // Should turn into a GEP
+ }
+ 
+ int *test2(int* I) {
+   return I-1;
+ }


Index: llvm/test/Regression/CFrontend/2003-11-04-EmptyStruct.c
diff -u llvm/test/Regression/CFrontend/2003-11-04-EmptyStruct.c:1.1 llvm/test/Regression/CFrontend/2003-11-04-EmptyStruct.c:1.2
--- llvm/test/Regression/CFrontend/2003-11-04-EmptyStruct.c:1.1	Tue Nov  4 12:52:01 2003
+++ llvm/test/Regression/CFrontend/2003-11-04-EmptyStruct.c	Sat Nov  8 18:23:05 2003
@@ -2,4 +2,3 @@
 struct fs_struct { rwlock_t lock; int umask; };
 void __copy_fs_struct(struct fs_struct *fs) { fs->lock = (rwlock_t) { }; }
 
-




From lattner at cs.uiuc.edu  Sat Nov  8 18:31:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 18:31:01 2003
Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/crtend/C++-Exception.h SJLJ-Exception.cpp
Message-ID: <200311090030.SAA01653@zion.cs.uiuc.edu>


Changes in directory llvm/runtime/GCCLibraries/crtend:

C++-Exception.h updated: 1.8 -> 1.9
SJLJ-Exception.cpp updated: 1.2 -> 1.3

---
Log message:

Totally disable assert, in order to fix PR101


---
Diffs of the changes:  (+10 -0)

Index: llvm/runtime/GCCLibraries/crtend/C++-Exception.h
diff -u llvm/runtime/GCCLibraries/crtend/C++-Exception.h:1.8 llvm/runtime/GCCLibraries/crtend/C++-Exception.h:1.9
--- llvm/runtime/GCCLibraries/crtend/C++-Exception.h:1.8	Sat Aug 30 17:47:59 2003
+++ llvm/runtime/GCCLibraries/crtend/C++-Exception.h	Sat Nov  8 18:29:51 2003
@@ -12,6 +12,11 @@
 #include 
 #include 
 
+// Assert should only be used for debugging the runtime library.  Enabling it in
+// CVS will break some platforms!
+#undef assert
+#define assert(X)
+
 struct llvm_cxx_exception {
   // TypeInfo - A pointer to the C++ std::type_info object for this exception
   // class.  This is required because the class may not be polymorphic.


Index: llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp
diff -u llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp:1.2 llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp:1.3
--- llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp:1.2	Sat Aug 30 18:31:08 2003
+++ llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp	Sat Nov  8 18:29:51 2003
@@ -9,6 +9,11 @@
 #include 
 #include 
 
+// Assert should only be used for debugging the runtime library.  Enabling it in
+// CVS will break some platforms!
+#undef assert
+#define assert(X)
+
 // get_sjlj_exception - Adjust the llvm_exception pointer to be an appropriate
 // llvm_sjlj_exception pointer.
 inline llvm_sjlj_exception *get_sjlj_exception(llvm_exception *E) {




From dhurjati at cs.uiuc.edu  Sat Nov  8 18:38:01 2003
From: dhurjati at cs.uiuc.edu (Dinakar Dhurjati)
Date: Sat Nov  8 18:38:01 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
Message-ID: <200311090037.SAA23375@psmith.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

PoolAllocatorBitMask.cpp updated: 1.28 -> 1.29

---
Log message:

Added poolcheck based on SearchForContainingSlab,


---
Diffs of the changes:  (+33 -0)

Index: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
diff -u poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.28 poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.29
--- poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.28	Sat Nov  8 16:44:59 2003
+++ poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp	Sat Nov  8 18:37:16 2003
@@ -630,6 +630,39 @@
   return PS;
 }
 
+// same as above, but this is the actual run time check called from the
+// code to check if the node belongs to the pool or not, so will be 
+// like crazy, (use a hash table ?)
+// FIXME cannot call this for pointers in the middle of the node yet,
+// asserts out if we do
+void poolcheck(PoolTy *Pool, void *Node) {
+   PoolSlab *PS = (PoolSlab*)Pool->Ptr1;
+  unsigned NodeSize = Pool->NodeSize;
+
+  // Search the partially allocated slab list for the slab that contains this
+  // node.
+  int Idx = -1;
+  if (PS) {               // Pool->Ptr1 could be null if Ptr2 isn't
+    for (; PS; PS = PS->Next) {
+      Idx = PS->containsElement(Node, NodeSize);
+      if (Idx != -1) break;
+    }
+  }
+
+  // If the partially allocated slab list doesn't contain it, maybe the
+  // completely allocated list does.
+  if (PS == 0) {
+    PS = (PoolSlab*)Pool->Ptr2;
+    while (1) {
+      assert(PS && "poolfree: node being free'd not found in allocation "
+             " pool specified!\n");
+      Idx = PS->containsElement(Node, NodeSize);
+      if (Idx != -1) break;
+      PS = PS->Next;
+    }
+  }
+}
+
 void poolfree(PoolTy *Pool, void *Node) {
   assert(Pool && "Null pool pointer passed in to poolfree!\n");
 




From dhurjati at cs.uiuc.edu  Sat Nov  8 18:55:01 2003
From: dhurjati at cs.uiuc.edu (Dinakar Dhurjati)
Date: Sat Nov  8 18:55:01 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/PoolAllocator.h
Message-ID: <200311090054.SAA25052@psmith.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

PoolAllocator.h updated: 1.5 -> 1.6

---
Log message:

Added poolcheck


---
Diffs of the changes:  (+1 -0)

Index: poolalloc/runtime/PoolAllocator/PoolAllocator.h
diff -u poolalloc/runtime/PoolAllocator/PoolAllocator.h:1.5 poolalloc/runtime/PoolAllocator/PoolAllocator.h:1.6
--- poolalloc/runtime/PoolAllocator/PoolAllocator.h:1.5	Sat Nov  8 16:44:59 2003
+++ poolalloc/runtime/PoolAllocator/PoolAllocator.h	Sat Nov  8 18:54:34 2003
@@ -34,6 +34,7 @@
   void pooldestroy(PoolTy *Pool);
   void *poolalloc(PoolTy *Pool, unsigned NumBytes);
   void poolfree(PoolTy *Pool, void *Node);
+  void poolcheck(PoolTy *Pool, void *Node);
 }
 
 #endif




From lattner at cs.uiuc.edu  Sat Nov  8 21:10:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 21:10:00 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
Message-ID: <200311090309.VAA09472@zion.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

PoolAllocatorBitMask.cpp updated: 1.29 -> 1.30

---
Log message:

containsElement is called a LOT.  Speed it up a bit


---
Diffs of the changes:  (+10 -10)

Index: poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp
diff -u poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.29 poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.30
--- poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp:1.29	Sat Nov  8 18:37:16 2003
+++ poolalloc/runtime/PoolAllocator/PoolAllocatorBitMask.cpp	Sat Nov  8 21:09:43 2003
@@ -331,16 +331,16 @@
 // this slab.  If the address is not in slab, return -1.
 int PoolSlab::containsElement(void *Ptr, unsigned ElementSize) const {
   const void *FirstElement = getElementAddress(0, 0);
-  if (FirstElement > Ptr || 
-      (char*)getElementAddress(ElementSize, getSlabSize())-1 < Ptr)
-    return -1;
-
-  unsigned Index = (char*)Ptr-(char*)FirstElement;
-  assert(Index % ElementSize == 0 &&
-         "Freeing pointer into the middle of an element!");
-  Index /= ElementSize;
-  assert(Index < getSlabSize() && "Pool slab searching loop broken!");
-  return Index;
+  if (FirstElement <= Ptr) {
+    unsigned Index = (char*)Ptr-(char*)FirstElement;
+    Index /= ElementSize;
+    if (Index < getSlabSize()) {
+      assert(Index % ElementSize == 0 &&
+             "Freeing pointer into the middle of an element!");
+      return Index;
+    }
+  }
+  return -1;
 }
 
 




From lattner at cs.uiuc.edu  Sat Nov  8 21:10:10 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 21:10:10 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/PageManager.cpp
Message-ID: <200311090309.VAA09461@zion.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

PageManager.cpp updated: 1.3 -> 1.4

---
Log message:

Add experiment which enables memalign if mmap isn't available or something.  It turns out that using memalign is more expensive than using mmap directly, so it's not enabled.


---
Diffs of the changes:  (+17 -1)

Index: poolalloc/runtime/PoolAllocator/PageManager.cpp
diff -u poolalloc/runtime/PoolAllocator/PageManager.cpp:1.3 poolalloc/runtime/PoolAllocator/PageManager.cpp:1.4
--- poolalloc/runtime/PoolAllocator/PageManager.cpp:1.3	Fri Nov  7 17:56:01 2003
+++ poolalloc/runtime/PoolAllocator/PageManager.cpp	Sat Nov  8 21:09:21 2003
@@ -21,6 +21,10 @@
 #include 
 #include 
 
+// Define this if we want to use memalign instead of mmap to get pages.
+// Empirically, this slows down the pool allocator a LOT.
+#define USE_MEMALIGN 0
+
 unsigned PageSize = 0;
 
 // Explicitly use the malloc allocator here, to avoid depending on the C++
@@ -32,6 +36,7 @@
   if (!PageSize) PageSize = sysconf(_SC_PAGESIZE);
 }
 
+#if !USE_MEMALIGN
 static void *GetPages(unsigned NumPages) {
 #if defined(i386) || defined(__i386__) || defined(__x86__)
   /* Linux and *BSD tend to have these flags named differently. */
@@ -56,11 +61,17 @@
   assert(pa != MAP_FAILED && "MMAP FAILED!");
   return pa;
 }
+#endif
 
 
 /// AllocatePage - This function returns a chunk of memory with size and
 /// alignment specified by PageSize.
 void *AllocatePage() {
+#if USE_MEMALIGN
+  void *Addr;
+  posix_memalign(&Addr, PageSize, PageSize);
+  return Addr;
+#else
   if (FreePages && !FreePages->empty()) {
     void *Result = FreePages->back();
     FreePages->pop_back();
@@ -68,7 +79,7 @@
   }
 
   // Allocate several pages, and put the extras on the freelist...
-  unsigned NumToAllocate = 10;
+  unsigned NumToAllocate = 8;
   char *Ptr = (char*)GetPages(NumToAllocate);
 
   if (!FreePages) {
@@ -80,13 +91,18 @@
   for (unsigned i = 1; i != NumToAllocate; ++i)
     FreePages->push_back(Ptr+i*PageSize);
   return Ptr;
+#endif
 }
 
 
 /// FreePage - This function returns the specified page to the pagemanager for
 /// future allocation.
 void FreePage(void *Page) {
+#if USE_MEMALIGN
+  free(Page);
+#else
   assert(FreePages && "No pages allocated!");
   FreePages->push_back(Page);
   //munmap(Page, 1);
+#endif
 }




From gaeke at cs.uiuc.edu  Sat Nov  8 21:16:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat Nov  8 21:16:01 2003
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/JIT.cpp
Message-ID: <200311090315.VAA09607@zion.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine/JIT:

JIT.cpp updated: 1.23 -> 1.24

---
Log message:

Remove #include of PassManager.h which was marked FIXME, and apparently is no
longer used.


---
Diffs of the changes:  (+0 -3)

Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.23 llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.24
--- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.23	Fri Nov  7 14:32:08 2003
+++ llvm/lib/ExecutionEngine/JIT/JIT.cpp	Sat Nov  8 21:15:40 2003
@@ -20,9 +20,6 @@
 #include "llvm/Target/TargetMachineImpls.h"
 #include "Support/CommandLine.h"
 
-// FIXME: REMOVE THIS
-#include "llvm/PassManager.h"
-
 #if !defined(ENABLE_X86_JIT) && !defined(ENABLE_SPARC_JIT)
 #define NO_JITS_ENABLED
 #endif




From lattner at cs.uiuc.edu  Sat Nov  8 21:34:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 21:34:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/DataStructure/Local.cpp
Message-ID: <200311090333.VAA10132@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/DataStructure:

Local.cpp updated: 1.68 -> 1.69

---
Log message:

Add support for memmove


---
Diffs of the changes:  (+9 -0)

Index: llvm/lib/Analysis/DataStructure/Local.cpp
diff -u llvm/lib/Analysis/DataStructure/Local.cpp:1.68 llvm/lib/Analysis/DataStructure/Local.cpp:1.69
--- llvm/lib/Analysis/DataStructure/Local.cpp:1.68	Sat Nov  8 15:55:50 2003
+++ llvm/lib/Analysis/DataStructure/Local.cpp	Sat Nov  8 21:32:52 2003
@@ -446,6 +446,15 @@
         if (DSNode *N = RetNH.getNode())
           N->setModifiedMarker();
         return;
+      } else if (F->getName() == "memmove") {
+        // Merge the first & second arguments with the result, and mark the
+        // memory read and modified.
+        DSNodeHandle RetNH = getValueDest(*CS.getInstruction());
+        RetNH.mergeWith(getValueDest(**CS.arg_begin()));
+        RetNH.mergeWith(getValueDest(**(CS.arg_begin()+1)));
+        if (DSNode *N = RetNH.getNode())
+          N->setModifiedMarker()->setReadMarker();
+        return;
       } else if (F->getName() == "bzero") {
         // Mark the memory modified.
         DSNodeHandle H = getValueDest(**CS.arg_begin());




From lattner at cs.uiuc.edu  Sat Nov  8 22:02:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 22:02:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp
Message-ID: <200311090401.WAA11360@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

CallGraph.cpp updated: 1.30 -> 1.31

---
Log message:

None of the __llvm_* functions call into the program.  This makes the 
callgraph MUCH simpler for eh using program.



---
Diffs of the changes:  (+3 -0)

Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.30 llvm/lib/Analysis/IPA/CallGraph.cpp:1.31
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.30	Fri Oct 31 15:05:12 2003
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Sat Nov  8 22:00:59 2003
@@ -165,6 +165,9 @@
     std::sort(Funcs.begin(), Funcs.end());
   }
 
+  if (Name.size() > 7 && !memcmp("__llvm_", Name.c_str(), 7))
+    return true;
+
   // Binary search for the function name...
   std::vector::iterator I =
     std::lower_bound(Funcs.begin(), Funcs.end(), Name);




From lattner at cs.uiuc.edu  Sat Nov  8 22:11:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 22:11:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp
Message-ID: <200311090410.WAA13613@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

CallGraph.cpp updated: 1.31 -> 1.32

---
Log message:

Add more functions


---
Diffs of the changes:  (+8 -0)

Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.31 llvm/lib/Analysis/IPA/CallGraph.cpp:1.32
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.31	Sat Nov  8 22:00:59 2003
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Sat Nov  8 22:10:41 2003
@@ -126,6 +126,12 @@
   "__strtod_l",
   "__strtold_l",
 
+  // Math functions
+  "exp", "sqrt", "cbrt", "hypot",
+  "log", "log10", "pow",
+  "sin", "cos", "tan",
+  "asin", "acos", "atan", "atan2",
+
   // Locale functions
   "__uselocale",
   "__newlocale",
@@ -143,6 +149,8 @@
   // Random stuff
   "__assert_fail",
   "__errno_location",
+  "clock", "time",
+  "__main",
 };
 
 




From lattner at cs.uiuc.edu  Sat Nov  8 23:05:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 23:05:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
Message-ID: <200311090504.XAA26550@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

DeadTypeElimination.cpp updated: 1.45 -> 1.46

---
Log message:

Untypo


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.45 llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.46
--- llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.45	Mon Oct 20 14:43:18 2003
+++ llvm/lib/Transforms/IPO/DeadTypeElimination.cpp	Sat Nov  8 23:04:25 2003
@@ -46,7 +46,7 @@
 
 
 
-// ShouldNukSymtabEntry - Return true if this module level symbol table entry
+// ShouldNukeSymtabEntry - Return true if this module level symbol table entry
 // should be eliminated.
 //
 static inline bool ShouldNukeSymtabEntry(const std::pair&E){




From lattner at cs.uiuc.edu  Sat Nov  8 23:06:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Nov  8 23:06:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/Inliner.cpp Inliner.h
Message-ID: <200311090505.XAA26563@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

Inliner.cpp updated: 1.3 -> 1.4
Inliner.h updated: 1.2 -> 1.3

---
Log message:

Do NOT inline self recursive calls into other functions.  This is causing the 
pool allocator no end of trouble, and doesn't make a lot of sense anyway.  This
does not solve the problem with mutually recursive functions, but they are much less common.


---
Diffs of the changes:  (+10 -1)

Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.3 llvm/lib/Transforms/IPO/Inliner.cpp:1.4
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.3	Fri Oct 31 15:05:58 2003
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Sat Nov  8 23:05:36 2003
@@ -64,9 +64,12 @@
         if (isa(I) || isa(I)) {
           CallSite CS = CallSite::get(I);
           if (Function *Callee = CS.getCalledFunction())
-            if (!Callee->isExternal()) {
+            if (!Callee->isExternal() && !IsRecursiveFunction.count(Callee)) {
               // Determine whether this is a function IN the SCC...
               bool inSCC = SCCFunctions.count(Callee);
+
+              // Keep track of whether this is a directly recursive function.
+              if (Callee == F) IsRecursiveFunction.insert(F);
 
               // If the policy determines that we should inline this function,
               // try to do so...


Index: llvm/lib/Transforms/IPO/Inliner.h
diff -u llvm/lib/Transforms/IPO/Inliner.h:1.2 llvm/lib/Transforms/IPO/Inliner.h:1.3
--- llvm/lib/Transforms/IPO/Inliner.h:1.2	Tue Oct 21 10:17:13 2003
+++ llvm/lib/Transforms/IPO/Inliner.h	Sat Nov  8 23:05:36 2003
@@ -51,7 +51,13 @@
   virtual int getRecursiveInlineCost(CallSite CS);
 
 private:
+  // InlineThreshold - Cache the value here for easy access.
   unsigned InlineThreshold;
+
+  // IsRecursiveFunction - This contains all functions which are directly
+  // recursive, which we do NOT want to inline into other functions.
+  std::set IsRecursiveFunction;
+
   bool performInlining(CallSite CS, std::set &SCC);
 };
 




From gaeke at cs.uiuc.edu  Sat Nov  8 23:31:00 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat Nov  8 23:31:00 2003
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200311090530.XAA00179@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.18 -> 1.19

---
Log message:

Get rid of 31337 SrcReg and TargReg variables in insertCopyMachineInstrs().

Call TargetRegInfo::getUnifiedRegNum() by its proper name.

Update insertBranchMachineInstrs() to use some 31337 code that I am ready to
commit to SparcV9CodeEmitter once all the Bug 103 poop has stopped flying.


---
Diffs of the changes:  (+19 -67)

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.18 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.19
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.18	Sat Nov  8 13:08:33 2003
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Sat Nov  8 23:30:26 2003
@@ -1,6 +1,5 @@
 //===- UnpackTraceFunction.cpp - Convert functions back to traces -*- C++ -*-=//
 //
-// WARNING, WARNING, WARNING; THIS IS HALF-UNIMPLEMENTED WORK IN PROGRESS!
 // Methods to convert functions, which had previously been converted from
 // traces into functions, back into traces.
 //
@@ -28,7 +27,6 @@
   UltraSparc TM;
   const TargetRegInfo &TRI = TM.getRegInfo ();
   std::vector mvec;
-  unsigned SrcReg = 31337, TargReg = 31337;
   int RegType;
   // Guess what kind of reg the register was allocated to.
   if (Ty == Type::FloatTy)
@@ -37,16 +35,13 @@
     RegType = UltraSparcRegInfo::FPDoubleRegType;
   else
     RegType = UltraSparcRegInfo::IntRegType;
-  if (Source.AllocState == AllocInfo::Allocated)
-    SrcReg = Source.Placement;
-  if (Target.AllocState == AllocInfo::Allocated)
-    TargReg = Target.Placement;
   const unsigned FramePtrReg = TRI.getFramePointer ();
   const unsigned StackPtrReg = TRI.getStackPointer ();
   if (Source.AllocState == AllocInfo::Spilled
       && Target.AllocState == AllocInfo::Allocated) {
     // Emit load instruction from stack loc. Source into register Target
-    TRI.cpMem2RegMI (mvec, FramePtrReg, Source.Placement, TargReg, RegType);
+    TRI.cpMem2RegMI (mvec, FramePtrReg, Source.Placement, Target.Placement,
+                     RegType);
   } else if (Source.AllocState == AllocInfo::Allocated
              && Target.AllocState == AllocInfo::Allocated) {
     // Emit move instruction from register Source to register Target
@@ -59,8 +54,8 @@
   } else if (Source.AllocState == AllocInfo::Spilled
              && Target.AllocState == AllocInfo::Spilled) {
     const unsigned TempReg = 
-      getUnifiedRegNum(UltraSparcRegInfo::IntRegClassID,
-                       SparcIntRegClass::g1); // just pick one?
+      TRI.getUnifiedRegNum (UltraSparcRegInfo::IntRegClassID,
+                            SparcIntRegClass::g1); // just pick one?
     // Emit load instruction from stack loc. Source into register TempReg
     TRI.cpMem2RegMI (mvec, FramePtrReg, Source.Placement, TempReg, RegType);
     // Emit store instruction from register TempReg to stack loc. Target
@@ -73,66 +68,23 @@
     B.push_back (*i);
 }
 
-/// Emit the same sequence of MachineInstrs that
-/// replaceMachineCodeForFunction() would emit, to branch from the end
-/// of B to TargetAddr. Note that the current implementation is
-/// SPARC-specific.
-///
-/// FIXME: refactor this so it shares code with SparcV9CodeEmitter.cpp's
-/// JITResolver::insertJumpAtAddr(), JITResolver::insertFarJumpAtAddr()
+/// Emit a branch from the end of B to TargetAddr. Note that the current
+/// implementation is SPARC-specific.
 ///
 void insertBranchMachineInstrs (uint64_t Target, MachineBasicBlock &B) {
-  DEBUG(std::cerr << "Emitting a jump to 0x" << std::hex << Target << "\n");
-
-  // FIXME: A "near jump" (Branch Always instruction) will get the
-  // WRONG address by this method, because the binary value of the
-  // instruction depends on the exact displacement from the branch
-  // source. Near jumps are disabled for now.
-  const int64_t Addr = (int64_t)(intptr_t)dummyFunction2;
-
-  int64_t BranchTarget = (Target-Addr) >> 2;
-  if (1 || (BranchTarget >= (1 << 19) || BranchTarget <= -(1 << 19))) {
-    /// FAR JUMP
-    static const unsigned 
-      o6 = SparcIntRegClass::o6, g0 = SparcIntRegClass::g0,
-      g1 = SparcIntRegClass::g1, g5 = SparcIntRegClass::g5;
-
-    MachineInstr* BinaryCode[] = {
-      // Get address to branch into %g1, using %g5 as a temporary
-      //
-      // sethi %uhi(Target), %g5     ;; get upper 22 bits of Target into %g5
-      BuildMI(V9::SETHI, 2).addSImm(Target >> 42).addReg(g5),
-      // or %g5, %ulo(Target), %g5   ;; get 10 lower bits of upper word into %g5
-      BuildMI(V9::ORi,3).addReg(g5).addSImm((Target >> 32) & 0x03ff).addReg(g5),
-      // sllx %g5, 32, %g5           ;; shift those 10 bits to the upper word
-      BuildMI(V9::SLLXi6, 3).addReg(g5).addSImm(32).addReg(g5),
-      // sethi %hi(Target), %g1      ;; extract bits 10-31 into the dest reg
-      BuildMI(V9::SETHI, 2).addSImm((Target >> 10) & 0x03fffff).addReg(g1),
-      // or %g5, %g1, %g1            ;; get upper word (in %g5) into %g1
-      BuildMI(V9::ORr, 3).addReg(g5).addReg(g1).addReg(g1),
-      // or %g1, %lo(Target), %g1    ;; get lowest 10 bits of Target into %g1
-      BuildMI(V9::ORi, 3).addReg(g1).addSImm(Target & 0x03ff).addReg(g1),
-      // jmpl %g1, %g0, %g0          ;; indirect branch on %g1
-      BuildMI(V9::JMPLRETr, 3).addReg(g1).addReg(g0).addReg(g0),
-      // nop                         ;; delay slot
-      BuildMI(V9::NOP, 0)
-    };
-
-    for (unsigned i=0, e=sizeof(BinaryCode)/sizeof(BinaryCode[0]); i!=e; ++i)
-      B.push_back (BinaryCode[i]);
-  } else {
-    /// NEAR JUMP: use "ba" instruction
-    // If the target function is close enough to fit into the 19bit disp of
-    // BA, we should use this version, as it's much cheaper to generate.
-
-    // ba 
-    MachineInstr *I = BuildMI(V9::BA, 1).addSImm(BranchTarget);
-    B.push_back (I);
-
-    // nop
-    I = BuildMI(V9::NOP, 0);
-    B.push_back (I);
-  }
+  // If the target is close enough to fit into the 19-bit disp of a "ba"
+  // instruction, then we really DO get a "ba" instruction.  We get the backend
+  // to calculate the PC-relative address from the absolute address upon
+  // emitting it to memory, by handing it a Constant and telling the backend
+  // it's a PC-relative MachineOperand. If the target is NOT close enough to
+  // fit in a "ba" instruction, the SparcV9CodeEmitter will automatically turn
+  // it into an indirect jump through a register.
+  
+  // ba 
+  Constant *TargetAsConstant = (ConstantUInt::get (Type::ULongTy, Target));
+  B.push_back (BuildMI (V9::BA, 1).addPCDisp (TargetAsConstant));
+  // nop
+  B.push_back (BuildMI (V9::NOP, 0));
 }
 
 extern "C" { 




From lattner at cs.uiuc.edu  Sun Nov  9 01:06:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 01:06:02 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
Message-ID: <200311090705.BAA27790@zion.cs.uiuc.edu>


Changes in directory llvm/test/Regression/C++Frontend:

2003-11-09-ConstructorTypeSafety.cpp.tr added (r1.1)

---
Log message:

New testcase


---
Diffs of the changes:  (+20 -0)

Index: llvm/test/Regression/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
diff -c /dev/null llvm/test/Regression/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr:1.1
*** /dev/null	Sun Nov  9 01:05:13 2003
--- llvm/test/Regression/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr	Sun Nov  9 01:05:02 2003
***************
*** 0 ****
--- 1,20 ----
+ // The code generated for this testcase should be completely typesafe!
+ // RUN: %llvmgcc -xc++ -S -o - %s | not grep ' cast '
+ 
+ struct contained {
+   unsigned X;
+   contained();
+ };
+ 
+ struct base {
+   unsigned A, B;
+ };
+ 
+ struct derived : public base {
+   contained _M_value_field;
+ };
+ 
+ int test() {
+   derived X;
+ }
+ 




From gaeke at cs.uiuc.edu  Sun Nov  9 01:09:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 01:09:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
Message-ID: <200311090708.BAA05140@seraph.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcV9CodeEmitter.cpp updated: 1.41 -> 1.42

---
Log message:

Fix PR103


---
Diffs of the changes:  (+3 -6)

Index: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.41 llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.42
--- llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.41	Fri Nov  7 15:07:30 2003
+++ llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp	Sun Nov  9 01:08:34 2003
@@ -606,12 +606,9 @@
       // external function calls, etc.?
       if (Function *F = dyn_cast(GV)) {
         DEBUG(std::cerr << "Function: ");
-        if (F->isExternal()) {
-          // Sparc backend broken: this MO should be `ExternalSymbol'
-          rv = (int64_t)MCE.getGlobalValueAddress(F->getName());
-        } else {
-          rv = (int64_t)MCE.getGlobalValueAddress(F);
-        }
+        // NOTE: This results in stubs being generated even for
+        // external, native functions, which is not optimal. See PR103.
+        rv = (int64_t)MCE.getGlobalValueAddress(F);
         if (rv == 0) {
           DEBUG(std::cerr << "not yet generated\n");
           // Function has not yet been code generated!




From lattner at cs.uiuc.edu  Sun Nov  9 09:52:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 09:52:02 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200311091551.JAA22970@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.106 -> 1.107

---
Log message:

Add an assertion


---
Diffs of the changes:  (+1 -0)

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.106 llvm/lib/VMCore/AsmWriter.cpp:1.107
--- llvm/lib/VMCore/AsmWriter.cpp:1.106	Thu Oct 30 17:41:03 2003
+++ llvm/lib/VMCore/AsmWriter.cpp	Sun Nov  9 09:51:07 2003
@@ -631,6 +631,7 @@
       if (const Constant *CPV = dyn_cast(V)) {
 	printConstant(CPV);
       } else if (const Type *Ty = dyn_cast(V)) {
+        assert(Ty->getType() == Type::TypeTy && TI->first == Type::TypeTy);
 	Out << "\t" << getLLVMName(I->first) << " = type ";
 
         // Make sure we print out at least one level of the type structure, so




From lattner at cs.uiuc.edu  Sun Nov  9 13:40:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 13:40:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/SymbolTable.h
Message-ID: <200311091939.NAA05945@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

SymbolTable.h updated: 1.27 -> 1.28

---
Log message:

Fix PR95.  I'm checking this patch in for Reid Spencer, who figured it out
and wrote it up.  Thanks!!


---
Diffs of the changes:  (+5 -1)

Index: llvm/include/llvm/SymbolTable.h
diff -u llvm/include/llvm/SymbolTable.h:1.27 llvm/include/llvm/SymbolTable.h:1.28
--- llvm/include/llvm/SymbolTable.h:1.27	Wed Oct 22 23:01:49 2003
+++ llvm/include/llvm/SymbolTable.h	Sun Nov  9 13:39:48 2003
@@ -36,7 +36,7 @@
   typedef VarMap::iterator type_iterator;
   typedef VarMap::const_iterator type_const_iterator;
 
-  inline SymbolTable() : InternallyInconsistent(false) {}
+  inline SymbolTable() : InternallyInconsistent(false), LastUnique(0) {}
   ~SymbolTable();
 
   // lookup - Returns null on failure...
@@ -108,6 +108,10 @@
   // set, removal from the symbol table is a noop.
   //
   bool InternallyInconsistent;
+
+  // LastUnique - This value is used to retain the last unique value used
+  // by getUniqueName to generate unique names.
+  unsigned long LastUnique;
 
   inline super::value_type operator[](const Type *Ty) {
     assert(0 && "Should not use this operator to access symbol table!");




From lattner at cs.uiuc.edu  Sun Nov  9 13:40:11 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 13:40:11 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/SymbolTable.cpp
Message-ID: <200311091939.NAA05938@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

SymbolTable.cpp updated: 1.37 -> 1.38

---
Log message:

Fix PR95.  I'm checking this patch in for Reid Spencer, who figured it out
and wrote it up.  Thanks!!



---
Diffs of the changes:  (+2 -3)

Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.37 llvm/lib/VMCore/SymbolTable.cpp:1.38
--- llvm/lib/VMCore/SymbolTable.cpp:1.37	Mon Oct 20 14:43:21 2003
+++ llvm/lib/VMCore/SymbolTable.cpp	Sun Nov  9 13:39:46 2003
@@ -61,11 +61,10 @@
   if (I == end()) return BaseName;
 
   std::string TryName = BaseName;
-  unsigned Counter = 0;
   type_iterator End = I->second.end();
 
-  while (I->second.find(TryName) != End)     // Loop until we find unoccupied
-    TryName = BaseName + utostr(++Counter);  // Name in the symbol table
+  while (I->second.find(TryName) != End)       // Loop until we find a free
+    TryName = BaseName + utostr(++LastUnique); // name in the symbol table
   return TryName;
 }
 




From lattner at cs.uiuc.edu  Sun Nov  9 13:45:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 13:45:01 2003
Subject: [llvm-commits] CVS: llvm-www/releases/1.0/docs/ReleaseNotes.html
Message-ID: <200311091944.NAA06244@zion.cs.uiuc.edu>


Changes in directory llvm-www/releases/1.0/docs:

ReleaseNotes.html updated: 1.25 -> 1.26

---
Log message:

Bugz bugz bugz



---
Diffs of the changes:  (+4 -1)

Index: llvm-www/releases/1.0/docs/ReleaseNotes.html
diff -u llvm-www/releases/1.0/docs/ReleaseNotes.html:1.25 llvm-www/releases/1.0/docs/ReleaseNotes.html:1.26
--- llvm-www/releases/1.0/docs/ReleaseNotes.html:1.25	Fri Nov  7 23:20:14 2003
+++ llvm-www/releases/1.0/docs/ReleaseNotes.html	Sun Nov  9 13:44:44 2003
@@ -202,6 +202,7 @@
 
 [setjmp/longjmp] Linking C programs which use setjmp/longjmp sometimes fail with references to the C++ runtime library!

 
+
SymbolTable::getUniqueName is very inefficient

 
 
 
Known problems with the C front-end

@@ -385,6 +386,8 @@
 
 [C++] Initializing array with constructable objects fail

 
+
[c++] C++ Frontend lays out superclasses like anonymous bitfields!

+
 
Notes:
 
 
The C++ front-end is based on a pre-release of the GCC 3.4 C++ parser.  This
@@ -491,6 +494,6 @@
 Maintained By: The LLVM Team

 
 
-Last modified: Fri Nov  7 22:27:02 CST 2003
+Last modified: Sun Nov  9 13:43:25 CST 2003
 
 




From lattner at cs.uiuc.edu  Sun Nov  9 13:45:12 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 13:45:12 2003
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200311091944.NAA06110@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.35 -> 1.36

---
Log message:

Bugz bugz bugz


---
Diffs of the changes:  (+3 -1)

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.35 llvm/docs/ReleaseNotes.html:1.36
--- llvm/docs/ReleaseNotes.html:1.35	Fri Nov  7 23:22:09 2003
+++ llvm/docs/ReleaseNotes.html	Sun Nov  9 13:44:07 2003
@@ -121,8 +121,10 @@
 
[bcreader] Cannot read shift constant expressions from bytecode file
 [lowersetjmp] Lowersetjmp pass breaks dominance properties!
 llvm-gcc tries to add bools
+SymbolTable::getUniqueName is very inefficient
 [buildscripts] Building into objdir with .o in it fails
 [setjmp/longjmp] Linking C programs which use setjmp/longjmp sometimes fail with references to the C++ runtime library!
+[c++] C++ Frontend lays out superclasses like anonymous bitfields!
 
 
 At this time, LLVM is known to work properly with SPEC CPU 2000, the Olden
@@ -429,6 +431,6 @@
 Maintained By: The LLVM Team

 
 
-Last modified: Fri Nov  7 22:26:24 CST 2003
+Last modified: Sun Nov  9 13:42:42 CST 2003
 
 




From lattner at cs.uiuc.edu  Sun Nov  9 13:55:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 13:55:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp
Message-ID: <200311091954.NAA06365@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

CallGraph.cpp updated: 1.32 -> 1.33

---
Log message:

More additions


---
Diffs of the changes:  (+4 -3)

Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.32 llvm/lib/Analysis/IPA/CallGraph.cpp:1.33
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.32	Sat Nov  8 22:10:41 2003
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Sun Nov  9 13:54:30 2003
@@ -66,9 +66,8 @@
   "ioctl",
 
   // Low-level stdc library functions
-  "abort",
-  "getenv",
-  "putenv",
+  "abort", "exit",
+  "getenv", "putenv",
   
   // Standard IO functions
   "printf",
@@ -115,6 +114,7 @@
   "strncpy",
   "strncmp",
   "strcmp",
+  "strtok",
   "__strcoll_l",
   "__strxfrm_l",
   "__strftime_l",
@@ -125,6 +125,7 @@
   "__strtof_l",
   "__strtod_l",
   "__strtold_l",
+  "isalpha",
 
   // Math functions
   "exp", "sqrt", "cbrt", "hypot",




From lattner at cs.uiuc.edu  Sun Nov  9 13:56:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 13:56:01 2003
Subject: [llvm-commits] CVS: llvm/tools/gccld/GenerateCode.cpp Makefile
Message-ID: <200311091955.NAA07233@zion.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

GenerateCode.cpp updated: 1.11 -> 1.12
Makefile updated: 1.6 -> 1.7

---
Log message:

Give gccld more guts


---
Diffs of the changes:  (+11 -2)

Index: llvm/tools/gccld/GenerateCode.cpp
diff -u llvm/tools/gccld/GenerateCode.cpp:1.11 llvm/tools/gccld/GenerateCode.cpp:1.12
--- llvm/tools/gccld/GenerateCode.cpp:1.11	Fri Oct 24 13:09:23 2003
+++ llvm/tools/gccld/GenerateCode.cpp	Sun Nov  9 13:55:09 2003
@@ -16,6 +16,7 @@
 #include "gccld.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
+#include "llvm/Analysis/LoadValueNumbering.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/IPO.h"
@@ -83,6 +84,13 @@
 
   if (!DisableInline)
     Passes.add(createFunctionInliningPass());   // Inline small functions
+
+  // Run a few AA driven optimizations here and now, to cleanup the code.
+  // Eventually we should put an IP AA in place here.
+
+  Passes.add(createLICMPass());                 // Hoist loop invariants
+  Passes.add(createLoadValueNumberingPass());   // GVN for load instructions
+  Passes.add(createGCSEPass());                 // Remove common subexprs
 
   // The FuncResolve pass may leave cruft around if functions were prototyped
   // differently than they were defined.  Remove this cruft.


Index: llvm/tools/gccld/Makefile
diff -u llvm/tools/gccld/Makefile:1.6 llvm/tools/gccld/Makefile:1.7
--- llvm/tools/gccld/Makefile:1.6	Mon Oct 20 17:27:26 2003
+++ llvm/tools/gccld/Makefile	Sun Nov  9 13:55:09 2003
@@ -1,4 +1,4 @@
-##===- tools/gccld/Makefile ------------------------------*- Makefile -*-===##
+##===- tools/gccld/Makefile --------------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,10 +6,11 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
+
 LEVEL = ../..
 
 TOOLNAME = gccld
-USEDLIBS = ipo.a analysis.a transforms.a ipa.a scalaropts.a transformutils.a \
+USEDLIBS = ipo.a transforms.a scalaropts.a analysis.a ipa.a transformutils.a \
            target.a bcreader bcwriter vmcore support.a
 
 include $(LEVEL)/Makefile.common




From brukman at cs.uiuc.edu  Sun Nov  9 15:37:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Sun Nov  9 15:37:01 2003
Subject: [llvm-commits] CVS: llvm/Makefile.rules
Message-ID: <200311092136.PAA13317@zion.cs.uiuc.edu>


Changes in directory llvm:

Makefile.rules updated: 1.156 -> 1.157

---
Log message:

If the source tree's Makefile is more up-to-date, copy it over into the build
tree.


---
Diffs of the changes:  (+6 -0)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.156 llvm/Makefile.rules:1.157
--- llvm/Makefile.rules:1.156	Sat Nov  8 15:23:06 2003
+++ llvm/Makefile.rules	Sun Nov  9 15:36:19 2003
@@ -816,6 +816,12 @@
 	@${ECHO} "****************************************************************"
 	$(VERB) exit 1
 
+# If the Makefile in the source tree has been updated, copy it over into the
+# build tree.
+Makefile :: $(BUILD_SRC_DIR)/Makefile
+	@${ECHO} "===== Makefile out of date, updating from source dir: `dirname $<` ====="
+	cp -f $< $@
+
 #
 # Include dependencies generated from C/C++ source files, but not if we
 # are cleaning (this example taken from the GNU Make Manual).




From lattner at cs.uiuc.edu  Sun Nov  9 16:15:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 16:15:01 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp PoolAllocate.cpp
Message-ID: <200311092214.QAA18779@zion.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

TransformFunctionBody.cpp added (r1.1)
PoolAllocate.cpp updated: 1.32 -> 1.33

---
Log message:

Split all of the low-level function transforming code out into a new file
Preparing to implement the poolinit/pooldestroy movement optimization


---
Diffs of the changes:  (+736 -702)

Index: poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp
diff -c /dev/null poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.1
*** /dev/null	Sun Nov  9 16:14:17 2003
--- poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp	Sun Nov  9 16:14:07 2003
***************
*** 0 ****
--- 1,689 ----
+ //===-- TransformFunctionBody.cpp - Pool Function Transformer -------------===//
+ //
+ // This file defines the PoolAllocate::TransformBody method.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #define DEBUG_TYPE "PoolAllocation"
+ #include "poolalloc/PoolAllocate.h"
+ #include "llvm/Analysis/DataStructure.h"
+ #include "llvm/Analysis/DSGraph.h"
+ #include "llvm/Function.h"
+ #include "llvm/DerivedTypes.h"
+ #include "llvm/Constants.h"
+ #include "llvm/Instructions.h"
+ #include "llvm/Target/TargetData.h"
+ #include "llvm/Support/InstVisitor.h"
+ #include "Support/Debug.h"
+ #include "Support/VectorExtras.h"
+ using namespace PA;
+ 
+ namespace {
+   /// FuncTransform - This class implements transformation required of pool
+   /// allocated functions.
+   struct FuncTransform : public InstVisitor {
+     PoolAllocate &PAInfo;
+     DSGraph &G;      // The Bottom-up DS Graph
+     DSGraph &TDG;    // The Top-down DS Graph
+     FuncInfo &FI;
+ 
+     // PoolUses - For each pool (identified by the pool descriptor) keep track
+     // of which blocks require the memory in the pool to not be freed.  This
+     // does not include poolfree's.
+     std::set &PoolUses;
+ 
+     // PoolDestroys - For each pool, keep track of the actual poolfree calls
+     // inserted into the code.  This is seperated out from PoolUses.
+     std::set   &PoolFrees;
+ 
+     FuncTransform(PoolAllocate &P, DSGraph &g, DSGraph &tdg, FuncInfo &fi,
+                   std::set &poolUses,
+                   std::set &poolFrees)
+       : PAInfo(P), G(g), TDG(tdg), FI(fi),
+         PoolUses(poolUses), PoolFrees(poolFrees) {
+     }
+ 
+     void visitMallocInst(MallocInst &MI);
+     void visitFreeInst(FreeInst &FI);
+     void visitCallSite(CallSite CS);
+     void visitCallInst(CallInst &CI) { visitCallSite(&CI); }
+     void visitInvokeInst(InvokeInst &II) { visitCallSite(&II); }
+     
+     // The following instructions are never modified by pool allocation
+     void visitBranchInst(BranchInst &I) { }
+     void visitUnwindInst(UnwindInst &I) { }
+     void visitBinaryOperator(Instruction &I) { }
+     void visitShiftInst (ShiftInst &I) { }
+     void visitSwitchInst (SwitchInst &I) { }
+     void visitCastInst (CastInst &I) { }
+     void visitAllocaInst(AllocaInst &I) { }
+     void visitLoadInst(LoadInst &I) { }
+     void visitGetElementPtrInst (GetElementPtrInst &I) { }
+ 
+     void visitReturnInst(ReturnInst &I);
+     void visitStoreInst (StoreInst &I);
+     void visitPHINode(PHINode &I);
+ 
+     void visitVAArgInst(VAArgInst &I) { }
+     void visitVANextInst(VANextInst &I) { }
+ 
+     void visitInstruction(Instruction &I) {
+       std::cerr << "PoolAllocate does not recognize this instruction:\n" << I;
+       abort();
+     }
+ 
+   private:
+     DSNodeHandle& getDSNodeHFor(Value *V) {
+       if (!FI.NewToOldValueMap.empty()) {
+         // If the NewToOldValueMap is in effect, use it.
+         std::map::iterator I = FI.NewToOldValueMap.find(V);
+         if (I != FI.NewToOldValueMap.end())
+           V = (Value*)I->second;
+       }
+ 
+       return G.getScalarMap()[V];
+     }
+ 
+     DSNodeHandle& getTDDSNodeHFor(Value *V) {
+       if (!FI.NewToOldValueMap.empty()) {
+         // If the NewToOldValueMap is in effect, use it.
+         std::map::iterator I = FI.NewToOldValueMap.find(V);
+         if (I != FI.NewToOldValueMap.end())
+           V = (Value*)I->second;
+       }
+ 
+       return TDG.getScalarMap()[V];
+     }
+ 
+     Value *getPoolHandle(Value *V) {
+       DSNode *Node = getDSNodeHFor(V).getNode();
+       // Get the pool handle for this DSNode...
+       std::map::iterator I = FI.PoolDescriptors.find(Node);
+ 
+       if (I != FI.PoolDescriptors.end()) {
+ 	// Check that the node pointed to by V in the TD DS graph is not
+ 	// collapsed
+ 	DSNode *TDNode = getTDDSNodeHFor(V).getNode();
+ 	if (TDNode->getType() != Type::VoidTy)
+ 	  return I->second;
+ 	else {
+ 	  PAInfo.CollapseFlag = 1;
+ 	  return 0;
+ 	}
+       }
+       else
+ 	return 0;
+ 	  
+     }
+     
+     bool isFuncPtr(Value *V);
+ 
+     Function* getFuncClass(Value *V);
+ 
+     Value* retCloneIfFunc(Value *V);
+   };
+ }
+ 
+ void PoolAllocate::TransformBody(DSGraph &g, DSGraph &tdg, PA::FuncInfo &fi,
+                                  std::set &poolUses,
+                                  std::set &poolFrees,
+                                  Function &F) {
+   FuncTransform(*this, g, tdg, fi, poolUses, poolFrees).visit(F);
+ }
+ 
+ 
+ // Returns true if V is a function pointer
+ bool FuncTransform::isFuncPtr(Value *V) {
+   if (const PointerType *PTy = dyn_cast(V->getType()))
+      return isa(PTy->getElementType());
+   return false;
+ }
+ 
+ // Given a function pointer, return the function eq. class if one exists
+ Function* FuncTransform::getFuncClass(Value *V) {
+   // Look at DSGraph and see if the set of of functions it could point to
+   // are pool allocated.
+ 
+   if (!isFuncPtr(V))
+     return 0;
+ 
+   // Two cases: 
+   // if V is a constant
+   if (Function *theFunc = dyn_cast(V)) {
+     if (!PAInfo.FuncECs.findClass(theFunc))
+       // If this function does not belong to any equivalence class
+       return 0;
+     if (PAInfo.EqClass2LastPoolArg.count(PAInfo.FuncECs.findClass(theFunc)))
+       return PAInfo.FuncECs.findClass(theFunc);
+     else
+       return 0;
+   }
+ 
+   // if V is not a constant
+   DSNode *DSN = TDG.getNodeForValue(V).getNode();
+   if (!DSN) {
+     return 0;
+   }
+   const std::vector &Callees = DSN->getGlobals();
+   if (Callees.size() > 0) {
+     Function *calledF = dyn_cast(*Callees.begin());
+     assert(PAInfo.FuncECs.findClass(calledF) && "should exist in some eq. class");
+     if (PAInfo.EqClass2LastPoolArg.count(PAInfo.FuncECs.findClass(calledF)))
+       return PAInfo.FuncECs.findClass(calledF);
+   }
+ 
+   return 0;
+ }
+ 
+ // Returns the clone if  V is a static function (not a pointer) and belongs 
+ // to an equivalence class i.e. is pool allocated
+ Value* FuncTransform::retCloneIfFunc(Value *V) {
+   if (Function *fixedFunc = dyn_cast(V))
+     if (getFuncClass(V))
+       return PAInfo.getFuncInfo(*fixedFunc)->Clone;
+   
+   return 0;
+ }
+ 
+ void FuncTransform::visitReturnInst (ReturnInst &RI) {
+   if (RI.getNumOperands())
+     if (Value *clonedFunc = retCloneIfFunc(RI.getOperand(0))) {
+       // Cast the clone of RI.getOperand(0) to the non-pool-allocated type
+       CastInst *CastI = new CastInst(clonedFunc, RI.getOperand(0)->getType(), 
+ 				     "tmp", &RI);
+       // Insert return instruction that returns the casted value
+       ReturnInst *RetI = new ReturnInst(CastI, &RI);
+ 
+       // Remove original return instruction
+       RI.getParent()->getInstList().erase(&RI);
+ 
+       if (!FI.NewToOldValueMap.empty()) {
+ 	std::map::iterator II =
+ 	  FI.NewToOldValueMap.find(&RI);
+ 	assert(II != FI.NewToOldValueMap.end() && 
+ 	       "RI not found in clone?");
+ 	FI.NewToOldValueMap.insert(std::make_pair(RetI, II->second));
+ 	FI.NewToOldValueMap.erase(II);
+       }
+     }
+ }
+ 
+ void FuncTransform::visitStoreInst (StoreInst &SI) {
+   // Check if a constant function is being stored
+   if (Value *clonedFunc = retCloneIfFunc(SI.getOperand(0))) {
+     CastInst *CastI = new CastInst(clonedFunc, SI.getOperand(0)->getType(), 
+ 				   "tmp", &SI);
+     StoreInst *StoreI = new StoreInst(CastI, SI.getOperand(1), &SI);
+     SI.getParent()->getInstList().erase(&SI);
+     
+     // Update the NewToOldValueMap if this is a clone
+     if (!FI.NewToOldValueMap.empty()) {
+       std::map::iterator II =
+ 	FI.NewToOldValueMap.find(&SI);
+       assert(II != FI.NewToOldValueMap.end() && 
+ 	     "SI not found in clone?");
+       FI.NewToOldValueMap.insert(std::make_pair(StoreI, II->second));
+       FI.NewToOldValueMap.erase(II);
+     }
+   }
+ }
+ 
+ void FuncTransform::visitPHINode(PHINode &PI) {
+   // If any of the operands of the PHI node is a constant function pointer
+   // that is cloned, the cast instruction has to be inserted at the end of the
+   // previous basic block
+   
+   if (isFuncPtr(&PI)) {
+     PHINode *V = new PHINode(PI.getType(), PI.getName(), &PI);
+     for (unsigned i = 0 ; i < PI.getNumIncomingValues(); ++i) {
+       if (Value *clonedFunc = retCloneIfFunc(PI.getIncomingValue(i))) {
+ 	// Insert CastInst at the end of  PI.getIncomingBlock(i)
+ 	BasicBlock::iterator BBI = --PI.getIncomingBlock(i)->end();
+ 	// BBI now points to the terminator instruction of the basic block.
+ 	CastInst *CastI = new CastInst(clonedFunc, PI.getType(), "tmp", BBI);
+ 	V->addIncoming(CastI, PI.getIncomingBlock(i));
+       } else {
+ 	V->addIncoming(PI.getIncomingValue(i), PI.getIncomingBlock(i));
+       }
+       
+     }
+     PI.replaceAllUsesWith(V);
+     PI.getParent()->getInstList().erase(&PI);
+     
+     DSGraph::ScalarMapTy &SM = G.getScalarMap();
+     DSGraph::ScalarMapTy::iterator PII = SM.find(&PI); 
+ 
+     // Update Scalar map of DSGraph if this is one of the original functions
+     // Otherwise update the NewToOldValueMap
+     if (PII != SM.end()) {
+       SM.insert(std::make_pair(V, PII->second));
+       SM.erase(PII);                     // Destroy the PHINode
+     } else {
+       std::map::iterator II =
+ 	FI.NewToOldValueMap.find(&PI);
+       assert(II != FI.NewToOldValueMap.end() && 
+ 	     "PhiI not found in clone?");
+       FI.NewToOldValueMap.insert(std::make_pair(V, II->second));
+       FI.NewToOldValueMap.erase(II);
+     }
+   }
+ }
+ 
+ void FuncTransform::visitMallocInst(MallocInst &MI) {
+   // Get the pool handle for the node that this contributes to...
+   Value *PH = getPoolHandle(&MI);
+   
+   // NB: PH is zero even if the node is collapsed
+   if (PH == 0) return;
+ 
+   std::string Name = MI.getName(); MI.setName("");
+ 
+   // Insert a call to poolalloc
+   TargetData &TD = PAInfo.getAnalysis();
+   Value *AllocSize =
+     ConstantUInt::get(Type::UIntTy, TD.getTypeSize(MI.getAllocatedType()));
+ 
+   if (MI.isArrayAllocation())
+     AllocSize = BinaryOperator::create(Instruction::Mul, AllocSize,
+                                        MI.getOperand(0), "sizetmp", &MI);
+ 
+   Value *V = new CallInst(PAInfo.PoolAlloc, make_vector(PH, AllocSize, 0),
+                           Name, &MI);
+ 
+   const Type *phtype = MI.getType()->getElementType();
+   std::map &PoolDescType = FI.PoolDescType;
+   if (!PoolDescType.count(PH))
+     PoolDescType[PH] = phtype;
+ 
+   Value *Casted = V;
+ 
+   // Cast to the appropriate type if necessary
+   if (V->getType() != MI.getType())
+     Casted = new CastInst(V, MI.getType(), V->getName(), &MI);
+     
+   // Update def-use info
+   MI.replaceAllUsesWith(Casted);
+ 
+   // Remove old malloc instruction
+   MI.getParent()->getInstList().erase(&MI);
+   
+   DSGraph::ScalarMapTy &SM = G.getScalarMap();
+   DSGraph::ScalarMapTy::iterator MII = SM.find(&MI);
+   
+   // If we are modifying the original function, update the DSGraph... 
+   if (MII != SM.end()) {
+     // V and Casted now point to whatever the original malloc did...
+     SM.insert(std::make_pair(V, MII->second));
+     if (V != Casted)
+       SM.insert(std::make_pair(Casted, MII->second));
+     SM.erase(MII);                     // The malloc is now destroyed
+   } else {             // Otherwise, update the NewToOldValueMap
+     std::map::iterator MII =
+       FI.NewToOldValueMap.find(&MI);
+     assert(MII != FI.NewToOldValueMap.end() && "MI not found in clone?");
+     FI.NewToOldValueMap.insert(std::make_pair(V, MII->second));
+     if (V != Casted)
+       FI.NewToOldValueMap.insert(std::make_pair(Casted, MII->second));
+     FI.NewToOldValueMap.erase(MII);
+   }
+ }
+ 
+ void FuncTransform::visitFreeInst(FreeInst &FrI) {
+   Value *Arg = FrI.getOperand(0);
+   Value *PH = getPoolHandle(Arg);  // Get the pool handle for this DSNode...
+   if (PH == 0) return;
+ 
+   const Type *phtype = 0;
+   if (const PointerType * ptype = dyn_cast(Arg->getType())) {
+     phtype = ptype->getElementType();
+   }
+   assert((phtype != 0) && "Needs to be implemented \n ");
+   std::map &PoolDescType = FI.PoolDescType;
+   if (!PoolDescType.count(PH))
+     PoolDescType[PH] = phtype;
+   
+   // Insert a cast and a call to poolfree...
+   Value *Casted = Arg;
+   if (Arg->getType() != PointerType::get(Type::SByteTy))
+     Casted = new CastInst(Arg, PointerType::get(Type::SByteTy),
+ 				 Arg->getName()+".casted", &FrI);
+ 
+   CallInst *FreeI = new CallInst(PAInfo.PoolFree, make_vector(PH, Casted, 0), 
+ 				 "", &FrI);
+   // Delete the now obsolete free instruction...
+   FrI.getParent()->getInstList().erase(&FrI);
+   
+   // Update the NewToOldValueMap if this is a clone
+   if (!FI.NewToOldValueMap.empty()) {
+     std::map::iterator II =
+       FI.NewToOldValueMap.find(&FrI);
+     assert(II != FI.NewToOldValueMap.end() && 
+ 	   "FrI not found in clone?");
+     FI.NewToOldValueMap.insert(std::make_pair(FreeI, II->second));
+     FI.NewToOldValueMap.erase(II);
+   }
+ }
+ 
+ static void CalcNodeMapping(DSNodeHandle& Caller, DSNodeHandle& Callee,
+                             std::map &NodeMapping) {
+   DSNode *CalleeNode = Callee.getNode();
+   DSNode *CallerNode = Caller.getNode();
+ 
+   unsigned CalleeOffset = Callee.getOffset();
+   unsigned CallerOffset = Caller.getOffset();
+ 
+   if (CalleeNode == 0) return;
+ 
+   // If callee has a node and caller doesn't, then a constant argument was
+   // passed by the caller
+   if (CallerNode == 0) {
+     NodeMapping.insert(NodeMapping.end(), std::make_pair(CalleeNode, 
+ 							 (DSNode *) 0));
+   }
+ 
+   // Map the callee node to the caller node. 
+   // NB: The callee node could be of a different type. Eg. if it points to the
+   // field of a struct that the caller points to
+   std::map::iterator I = NodeMapping.find(CalleeNode);
+   if (I != NodeMapping.end()) {   // Node already in map...
+     assert(I->second == CallerNode && 
+ 	   "Node maps to different nodes on paths?");
+   } else {
+     NodeMapping.insert(I, std::make_pair(CalleeNode, CallerNode));
+     
+     if (CalleeNode->getType() != CallerNode->getType() && CallerOffset == 0) 
+       DEBUG(std::cerr << "NB: Mapping of nodes between different types\n");
+ 
+     // Recursively map the callee links to the caller links starting from the
+     // offset in the node into which they are mapped.
+     // Being a BU Graph, the callee ought to have smaller number of links unless
+     // there is collapsing in the caller
+     unsigned numCallerLinks = CallerNode->getNumLinks() - CallerOffset;
+     unsigned numCalleeLinks = CalleeNode->getNumLinks() - CalleeOffset;
+     
+     if (numCallerLinks > 0) {
+       if (numCallerLinks < numCalleeLinks) {
+ 	DEBUG(std::cerr << "Potential node collapsing in caller\n");
+ 	for (unsigned i = 0, e = numCalleeLinks; i != e; ++i)
+ 	  CalcNodeMapping(CallerNode->getLink(((i%numCallerLinks) << DS::PointerShift) + CallerOffset),
+                           CalleeNode->getLink((i << DS::PointerShift) + CalleeOffset), NodeMapping);
+       } else {
+ 	for (unsigned i = 0, e = numCalleeLinks; i != e; ++i)
+ 	  CalcNodeMapping(CallerNode->getLink((i << DS::PointerShift) + CallerOffset),
+                           CalleeNode->getLink((i << DS::PointerShift) + CalleeOffset), NodeMapping);
+       }
+     } else if (numCalleeLinks > 0) {
+       DEBUG(std::cerr << 
+ 	    "Caller has unexpanded node, due to indirect call perhaps!\n");
+     }
+   }
+ }
+ 
+ void FuncTransform::visitCallSite(CallSite CS) {
+   Function *CF = CS.getCalledFunction();
+   Instruction *TheCall = CS.getInstruction();
+ 
+   // optimization for function pointers that are basically gotten from a cast
+   // with only one use and constant expressions with casts in them
+   if (!CF) {
+     Value *CV = CS.getCalledValue();
+     if (CastInst* CastI = dyn_cast(CV)) {
+       if (isa(CastI->getOperand(0)) && 
+ 	  CastI->getOperand(0)->getType() == CastI->getType())
+ 	CF = dyn_cast(CastI->getOperand(0));
+     } else if (ConstantExpr *CE = dyn_cast(CV)) {
+       if (CE->getOpcode() == Instruction::Cast)
+ 	if (ConstantPointerRef *CPR
+             = dyn_cast(CE->getOperand(0)))
+           CF = dyn_cast(CPR->getValue());
+     }
+   }
+ 
+   DSGraph &CallerG = G;
+ 
+   std::vector Args;  
+ 
+   // We need to figure out which local pool descriptors correspond to the pool
+   // descriptor arguments passed into the function call.  Calculate a mapping
+   // from callee DSNodes to caller DSNodes.  We construct a partial isomophism
+   // between the graphs to figure out which pool descriptors need to be passed
+   // in.  The roots of this mapping is found from arguments and return values.
+   //
+   std::map NodeMapping;
+ 
+   if (!CF) {   // Indirect call
+     DEBUG(std::cerr << "  Handling call: " << *TheCall);
+     
+     std::map PoolArgs;
+     Function *FuncClass;
+     
+     std::pair::iterator,
+               std::multimap::iterator> Targets =
+       PAInfo.CallSiteTargets.equal_range(CS);
+     for (std::multimap::iterator TFI = Targets.first,
+ 	   TFE = Targets.second; TFI != TFE; ++TFI) {
+       if (TFI == Targets.first) {
+ 	FuncClass = PAInfo.FuncECs.findClass(TFI->second);
+ 	// Nothing to transform if there are no pool arguments in this
+ 	// equivalence class of functions.
+ 	if (!PAInfo.EqClass2LastPoolArg.count(FuncClass))
+ 	  return;
+       }
+       
+       FuncInfo *CFI = PAInfo.getFuncInfo(*TFI->second);
+ 
+       if (!CFI->ArgNodes.size()) continue;  // Nothing to transform...
+       
+       DSGraph &CG = PAInfo.getBUDataStructures().getDSGraph(*TFI->second);  
+       
+       {
+         Function::aiterator FAI = TFI->second->abegin(),E = TFI->second->aend();
+         CallSite::arg_iterator AI = CS.arg_begin(), AE = CS.arg_end();
+         for ( ; FAI != E && AI != AE; ++FAI, ++AI)
+           if (!isa(*AI))
+             CalcNodeMapping(getDSNodeHFor(*AI), CG.getScalarMap()[FAI],
+                             NodeMapping);
+         assert(AI == AE && "Varargs calls not handled yet!");
+       }
+       
+       if (TheCall->getType() != Type::VoidTy)
+         CalcNodeMapping(getDSNodeHFor(TheCall),
+                         CG.getReturnNodeFor(*TFI->second), NodeMapping);
+       
+       // Map the nodes that are pointed to by globals.
+       // For all globals map getDSNodeForGlobal(g)->CG.getDSNodeForGlobal(g)
+       for (DSGraph::ScalarMapTy::iterator SMI = G.getScalarMap().begin(), 
+              SME = G.getScalarMap().end(); SMI != SME; ++SMI)
+         if (isa(SMI->first)) { 
+           CalcNodeMapping(SMI->second, 
+                           CG.getScalarMap()[SMI->first], NodeMapping);
+         }
+ 
+       unsigned idx = CFI->PoolArgFirst;
+ 
+       // The following loop determines the pool pointers corresponding to 
+       // CFI.
+       for (unsigned i = 0, e = CFI->ArgNodes.size(); i != e; ++i, ++idx) {
+         if (NodeMapping.count(CFI->ArgNodes[i])) {
+           assert(NodeMapping.count(CFI->ArgNodes[i]) && "Node not in mapping!");
+           DSNode *LocalNode = NodeMapping.find(CFI->ArgNodes[i])->second;
+           if (LocalNode) {
+             assert(FI.PoolDescriptors.count(LocalNode) &&
+                    "Node not pool allocated?");
+             PoolArgs[idx] = FI.PoolDescriptors.find(LocalNode)->second;
+           }
+           else
+             // LocalNode is null when a constant is passed in as a parameter
+             PoolArgs[idx] = Constant::getNullValue(PoolAllocate::PoolDescPtrTy);
+         } else {
+           PoolArgs[idx] = Constant::getNullValue(PoolAllocate::PoolDescPtrTy);
+         }
+       }
+     }
+     
+     // Push the pool arguments into Args.
+     if (PAInfo.EqClass2LastPoolArg.count(FuncClass)) {
+       for (int i = 0; i <= PAInfo.EqClass2LastPoolArg[FuncClass]; ++i) {
+         if (PoolArgs.find(i) != PoolArgs.end())
+           Args.push_back(PoolArgs[i]);
+         else
+           Args.push_back(Constant::getNullValue(PoolAllocate::PoolDescPtrTy));
+       }
+     
+       assert(Args.size()== (unsigned) PAInfo.EqClass2LastPoolArg[FuncClass] + 1
+              && "Call has same number of pool args as the called function");
+     }
+ 
+     // Add the rest of the arguments (the original arguments of the function)...
+     Args.insert(Args.end(), CS.arg_begin(), CS.arg_end());
+     
+     std::string Name = TheCall->getName(); TheCall->setName("");
+     
+     Value *NewCall;
+     Value *CalledValuePtr = CS.getCalledValue();
+     if (Args.size() > (unsigned)CS.arg_size()) {
+       // If there are any pool arguments
+       CalledValuePtr = new CastInst(CS.getCalledValue(), 
+                        PAInfo.getFuncInfo(*FuncClass)->Clone->getType(), "tmp", 
+                                     TheCall);
+     }
+ 
+     if (InvokeInst *II = dyn_cast(TheCall)) {
+       NewCall = new InvokeInst(CalledValuePtr, II->getNormalDest(),
+                                II->getExceptionalDest(), Args, Name, TheCall);
+     } else {
+       NewCall = new CallInst(CalledValuePtr, Args, Name, TheCall);
+     }
+ 
+     TheCall->replaceAllUsesWith(NewCall);
+     DEBUG(std::cerr << "  Result Call: " << *NewCall);
+       
+     if (TheCall->getType() != Type::VoidTy) {
+       // If we are modifying the original function, update the DSGraph... 
+       DSGraph::ScalarMapTy &SM = G.getScalarMap();
+       DSGraph::ScalarMapTy::iterator CII = SM.find(TheCall);
+       if (CII != SM.end()) {
+ 	SM.insert(std::make_pair(NewCall, CII->second));
+ 	SM.erase(CII);                     // Destroy the CallInst
+       } else { 
+ 	// Otherwise update the NewToOldValueMap with the new CI return value
+ 	std::map::iterator CII = 
+ 	  FI.NewToOldValueMap.find(TheCall);
+ 	assert(CII != FI.NewToOldValueMap.end() && "CI not found in clone?");
+ 	FI.NewToOldValueMap.insert(std::make_pair(NewCall, CII->second));
+ 	FI.NewToOldValueMap.erase(CII);
+       }
+     } else if (!FI.NewToOldValueMap.empty()) {
+       std::map::iterator II =
+ 	FI.NewToOldValueMap.find(TheCall);
+       assert(II != FI.NewToOldValueMap.end() && 
+ 	     "CI not found in clone?");
+       FI.NewToOldValueMap.insert(std::make_pair(NewCall, II->second));
+       FI.NewToOldValueMap.erase(II);
+     }
+   } else {
+     FuncInfo *CFI = PAInfo.getFuncInfo(*CF);
+ 
+     if (CFI == 0 || CFI->Clone == 0) return;  // Nothing to transform...
+     
+     DEBUG(std::cerr << "  Handling call: " << *TheCall);
+     
+     DSGraph &CG = PAInfo.getBUDataStructures().getDSGraph(*CF);  // Callee graph
+ 
+     {
+       Function::aiterator FAI = CF->abegin(), E = CF->aend();
+       CallSite::arg_iterator AI = CS.arg_begin(), AE = CS.arg_end();
+       for ( ; FAI != E && AI != AE; ++FAI, ++AI)
+         if (!isa(*AI))
+           CalcNodeMapping(getDSNodeHFor(*AI), CG.getScalarMap()[FAI],
+                           NodeMapping);
+       assert(AI == AE && "Varargs calls not handled yet!");
+     }
+ 
+     // Map the return value as well...
+     if (TheCall->getType() != Type::VoidTy)
+       CalcNodeMapping(getDSNodeHFor(TheCall), CG.getReturnNodeFor(*CF),
+ 		      NodeMapping);
+ 
+     // Map the nodes that are pointed to by globals.
+     // For all globals map getDSNodeForGlobal(g)->CG.getDSNodeForGlobal(g)
+     for (DSGraph::ScalarMapTy::iterator SMI = G.getScalarMap().begin(), 
+ 	   SME = G.getScalarMap().end(); SMI != SME; ++SMI)
+       if (isa(SMI->first)) 
+ 	CalcNodeMapping(SMI->second, 
+ 			CG.getScalarMap()[SMI->first], NodeMapping);
+ 
+     // Okay, now that we have established our mapping, we can figure out which
+     // pool descriptors to pass in...
+ 
+     // Add an argument for each pool which must be passed in...
+     if (CFI->PoolArgFirst != 0) {
+       for (int i = 0; i < CFI->PoolArgFirst; ++i)
+ 	Args.push_back(Constant::getNullValue(PoolAllocate::PoolDescPtrTy));  
+     }
+ 
+     for (unsigned i = 0, e = CFI->ArgNodes.size(); i != e; ++i) {
+       if (NodeMapping.count(CFI->ArgNodes[i])) {
+ 
+ 	DSNode *LocalNode = NodeMapping.find(CFI->ArgNodes[i])->second;
+ 	if (LocalNode) {
+ 	  assert(FI.PoolDescriptors.count(LocalNode) &&
+                  "Node not pool allocated?");
+ 	  Args.push_back(FI.PoolDescriptors.find(LocalNode)->second);
+ 	} else
+ 	  Args.push_back(Constant::getNullValue(PoolAllocate::PoolDescPtrTy));
+       } else {
+ 	Args.push_back(Constant::getNullValue(PoolAllocate::PoolDescPtrTy));
+       }
+     }
+ 
+     Function *FuncClass = PAInfo.FuncECs.findClass(CF);
+     
+     if (PAInfo.EqClass2LastPoolArg.count(FuncClass))
+       for (int i = CFI->PoolArgLast; 
+ 	   i <= PAInfo.EqClass2LastPoolArg[FuncClass]; ++i)
+ 	Args.push_back(Constant::getNullValue(PoolAllocate::PoolDescPtrTy));
+ 
+     // Add the rest of the arguments...
+     Args.insert(Args.end(), CS.arg_begin(), CS.arg_end());
+     
+     std::string Name = TheCall->getName(); TheCall->setName("");
+ 
+     Value *NewCall;
+     if (InvokeInst *II = dyn_cast(TheCall)) {
+       NewCall = new InvokeInst(CFI->Clone, II->getNormalDest(),
+                                II->getExceptionalDest(), Args, Name, TheCall);
+     } else {
+       NewCall = new CallInst(CFI->Clone, Args, Name, TheCall);
+     }
+ 
+     TheCall->replaceAllUsesWith(NewCall);
+     DEBUG(std::cerr << "  Result Call: " << *NewCall);
+ 
+     if (TheCall->getType() != Type::VoidTy) {
+       // If we are modifying the original function, update the DSGraph... 
+       DSGraph::ScalarMapTy &SM = G.getScalarMap();
+       DSGraph::ScalarMapTy::iterator CII = SM.find(TheCall); 
+       if (CII != SM.end()) {
+ 	SM.insert(std::make_pair(NewCall, CII->second));
+ 	SM.erase(CII);                     // Destroy the CallInst
+       } else { 
+ 	// Otherwise update the NewToOldValueMap with the new CI return value
+ 	std::map::iterator CNII = 
+ 	  FI.NewToOldValueMap.find(TheCall);
+ 	assert(CNII != FI.NewToOldValueMap.end() && CNII->second && 
+ 	       "CI not found in clone?");
+ 	FI.NewToOldValueMap.insert(std::make_pair(NewCall, CNII->second));
+ 	FI.NewToOldValueMap.erase(CNII);
+       }
+     } else if (!FI.NewToOldValueMap.empty()) {
+       std::map::iterator II =
+ 	FI.NewToOldValueMap.find(TheCall);
+       assert(II != FI.NewToOldValueMap.end() && "CI not found in clone?");
+       FI.NewToOldValueMap.insert(std::make_pair(NewCall, II->second));
+       FI.NewToOldValueMap.erase(II);
+     }
+   }
+ 
+   TheCall->getParent()->getInstList().erase(TheCall);
+ }


Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.32 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.33
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.32	Sat Nov  8 16:36:55 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Sun Nov  9 16:14:07 2003
@@ -10,17 +10,18 @@
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Analysis/DSGraph.h"
-#include "llvm/Module.h"
-#include "llvm/DerivedTypes.h"
 #include "llvm/Constants.h"
+#include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
+#include "llvm/Module.h"
 #include "llvm/Target/TargetData.h"
-#include "llvm/Support/InstVisitor.h"
 #include "Support/Debug.h"
 #include "Support/VectorExtras.h"
 #include "Support/Statistic.h"
 using namespace PA;
 
+const Type *PoolAllocate::PoolDescPtrTy = 0;
+
 namespace {
   Statistic<> NumArgsAdded("poolalloc", "Number of function arguments added");
   Statistic<> NumCloned   ("poolalloc", "Number of functions cloned");
@@ -35,8 +36,6 @@
   //                        poolfree?)
   const Type *PoolDescType;
   
-  const PointerType *PoolDescPtr;
-  
   RegisterOpt
   X("poolalloc", "Pool allocate disjoint data structures");
 }
@@ -131,7 +130,7 @@
     PoolDescType =
       StructType::get(make_vector(VoidPtrTy, VoidPtrTy,
                                                Type::UIntTy, Type::UIntTy, 0));
-    PoolDescPtr = PointerType::get(PoolDescType);
+    PoolDescPtrTy = PointerType::get(PoolDescType);
   }
   
   AddPoolPrototypes();
@@ -186,20 +185,20 @@
   
   // Get poolinit function...
   PoolInit = CurModule->getOrInsertFunction("poolinit", Type::VoidTy,
-                                            PoolDescPtr, Type::UIntTy, 0);
+                                            PoolDescPtrTy, Type::UIntTy, 0);
 
   // Get pooldestroy function...
   PoolDestroy = CurModule->getOrInsertFunction("pooldestroy", Type::VoidTy,
-                                               PoolDescPtr, 0);
+                                               PoolDescPtrTy, 0);
   
   // The poolalloc function
   PoolAlloc = CurModule->getOrInsertFunction("poolalloc", 
-                                             VoidPtrTy, PoolDescPtr,
+                                             VoidPtrTy, PoolDescPtrTy,
                                              Type::UIntTy, 0);
   
   // Get the poolfree function...
   PoolFree = CurModule->getOrInsertFunction("poolfree", Type::VoidTy,
-                                            PoolDescPtr, VoidPtrTy, 0);  
+                                            PoolDescPtrTy, VoidPtrTy, 0);  
 }
 
 // Inline the DSGraphs of functions corresponding to the potential targets at
@@ -371,7 +370,7 @@
     FI.ArgNodes.reserve(MarkedNodes.size());
     for (hash_set::iterator I = MarkedNodes.begin(),
 	   E = MarkedNodes.end(); I != E; ++I) {
-      ArgTys.push_back(PoolDescPtr);      // Add the appropriate # of pool descs
+      ArgTys.push_back(PoolDescPtrTy);    // Add the appropriate # of pool descs
       FI.ArgNodes.push_back(*I);
     }
     if (FI.ArgNodes.empty()) return 0;      // No nodes to be pool allocated!
@@ -383,10 +382,8 @@
 		   EqClass2LastPoolArg[FuncECs.findClass(&F)] + 1);
     FI.ArgNodes.reserve(EqClass2LastPoolArg[FuncECs.findClass(&F)] + 1);
     
-    for (int i = 0; i <= EqClass2LastPoolArg[FuncECs.findClass(&F)]; ++i) {
-      ArgTys.push_back(PoolDescPtr);      // Add the appropriate # of pool 
-                                          // descs
-    }
+    for (int i = 0; i <= EqClass2LastPoolArg[FuncECs.findClass(&F)]; ++i)
+      ArgTys.push_back(PoolDescPtrTy);    // Add the appropriate # of pool descs
 
     for (hash_set::iterator I = MarkedNodes.begin(),
 	   E = MarkedNodes.end(); I != E; ++I) {
@@ -484,41 +481,6 @@
 }
 
 
-// processFunction - Pool allocate any data structures which are contained in
-// the specified function...
-//
-void PoolAllocate::ProcessFunctionBody(Function &F, Function &NewF) {
-  DSGraph &G = BU->getDSGraph(F);
-
-  std::vector &Nodes = G.getNodes();
-  if (Nodes.empty()) return;     // Quick exit if nothing to do...
-  
-  FuncInfo &FI = FunctionInfo[&F];   // Get FuncInfo for F
-  hash_set &MarkedNodes = FI.MarkedNodes;
-  
-  DEBUG(std::cerr << "[" << F.getName() << "] Pool Allocate: ");
-  
-  // Loop over all of the nodes which are non-escaping, adding pool-allocatable
-  // ones to the NodesToPA vector.
-  std::vector NodesToPA;
-  for (unsigned i = 0, e = Nodes.size(); i != e; ++i)
-    if (Nodes[i]->isHeapNode() &&   // Pick nodes with heap elems
-        !MarkedNodes.count(Nodes[i]))              // Can't be marked
-      NodesToPA.push_back(Nodes[i]);
-  
-  DEBUG(std::cerr << NodesToPA.size() << " nodes to pool allocate\n");
-  if (!NodesToPA.empty()) {
-    // Create pool construction/destruction code
-    std::map &PoolDescriptors = FI.PoolDescriptors;
-    std::map &PoolDescTypeMap = FI.PoolDescType;
-    CreatePools(NewF, NodesToPA, PoolDescriptors, PoolDescTypeMap);
-  }
-  
-  // Transform the body of the function now...
-  TransformFunctionBody(NewF, F, G, FI);
-}
-
-
 // CreatePools - This creates the pool initialization and destruction code for
 // the DSNodes specified by the NodesToPA list.  This adds an entry to the
 // PoolDescriptors map for each DSNode.
@@ -526,7 +488,8 @@
 void PoolAllocate::CreatePools(Function &F,
                                const std::vector &NodesToPA,
                                std::map &PoolDescriptors,
-			       std::map &PoolDescTypeMap) {
+			       std::map &PoolDescTypeMap) {
   // Find all of the return nodes in the CFG...
   std::vector ReturnNodes;
   for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I)
@@ -552,11 +515,10 @@
     if (Node->getType() != Type::VoidTy) {
       ElSize = ConstantUInt::get(Type::UIntTy, TD.getTypeSize(Node->getType()));
       Eltype = Node->getType();
-    }
-    else {
-      DEBUG(std::cerr << "Potential node collapsing in " << F.getName() 
-		<< ". All Data Structures may not be pool allocated\n");
-      ElSize = ConstantUInt::get(Type::UIntTy, 0);
+    } else {
+      std::cerr << "Node collapsing in '" << F.getName() 
+		<< "'. All Data Structures may not be pool allocated\n";
+      ElSize = ConstantUInt::get(Type::UIntTy, 1);
     }
     
     // Insert the call to initialize the pool...
@@ -575,658 +537,41 @@
 }
 
 
-namespace {
-  /// FuncTransform - This class implements transformation required of pool
-  /// allocated functions.
-  struct FuncTransform : public InstVisitor {
-    PoolAllocate &PAInfo;
-    DSGraph &G;      // The Bottom-up DS Graph
-    DSGraph &TDG;    // The Top-down DS Graph
-    FuncInfo &FI;
 
-    FuncTransform(PoolAllocate &P, DSGraph &g, DSGraph &tdg, FuncInfo &fi)
-      : PAInfo(P), G(g), TDG(tdg), FI(fi) {
-    }
-
-    void visitMallocInst(MallocInst &MI);
-    void visitFreeInst(FreeInst &FI);
-    void visitCallSite(CallSite CS);
-    void visitCallInst(CallInst &CI) { visitCallSite(&CI); }
-    void visitInvokeInst(InvokeInst &II) { visitCallSite(&II); }
-    
-    // The following instructions are never modified by pool allocation
-    void visitBranchInst(BranchInst &I) { }
-    void visitUnwindInst(UnwindInst &I) { }
-    void visitBinaryOperator(Instruction &I) { }
-    void visitShiftInst (ShiftInst &I) { }
-    void visitSwitchInst (SwitchInst &I) { }
-    void visitCastInst (CastInst &I) { }
-    void visitAllocaInst(AllocaInst &I) { }
-    void visitLoadInst(LoadInst &I) { }
-    void visitGetElementPtrInst (GetElementPtrInst &I) { }
-
-    void visitReturnInst(ReturnInst &I);
-    void visitStoreInst (StoreInst &I);
-    void visitPHINode(PHINode &I);
-
-    void visitVAArgInst(VAArgInst &I) { }
-    void visitVANextInst(VANextInst &I) { }
-
-    void visitInstruction(Instruction &I) {
-      std::cerr << "PoolAllocate does not recognize this instruction:\n" << I;
-      abort();
-    }
-
-  private:
-    DSNodeHandle& getDSNodeHFor(Value *V) {
-      //      if (isa(V))
-      //	return DSNodeHandle();
-
-      if (!FI.NewToOldValueMap.empty()) {
-        // If the NewToOldValueMap is in effect, use it.
-        std::map::iterator I = FI.NewToOldValueMap.find(V);
-        if (I != FI.NewToOldValueMap.end())
-          V = (Value*)I->second;
-      }
-
-      return G.getScalarMap()[V];
-    }
-
-    DSNodeHandle& getTDDSNodeHFor(Value *V) {
-      if (!FI.NewToOldValueMap.empty()) {
-        // If the NewToOldValueMap is in effect, use it.
-        std::map::iterator I = FI.NewToOldValueMap.find(V);
-        if (I != FI.NewToOldValueMap.end())
-          V = (Value*)I->second;
-      }
-
-      return TDG.getScalarMap()[V];
-    }
-
-    Value *getPoolHandle(Value *V) {
-      DSNode *Node = getDSNodeHFor(V).getNode();
-      // Get the pool handle for this DSNode...
-      std::map::iterator I = FI.PoolDescriptors.find(Node);
-
-      if (I != FI.PoolDescriptors.end()) {
-	// Check that the node pointed to by V in the TD DS graph is not
-	// collapsed
-	DSNode *TDNode = getTDDSNodeHFor(V).getNode();
-	if (TDNode->getType() != Type::VoidTy)
-	  return I->second;
-	else {
-	  PAInfo.CollapseFlag = 1;
-	  return 0;
-	}
-      }
-      else
-	return 0;
-	  
-    }
-    
-    bool isFuncPtr(Value *V);
-
-    Function* getFuncClass(Value *V);
-
-    Value* retCloneIfFunc(Value *V);
-  };
-}
-
-void PoolAllocate::TransformFunctionBody(Function &F, Function &OldF,
-                                         DSGraph &G, FuncInfo &FI) {
-  FuncTransform(*this, G, TDDS->getDSGraph(OldF), FI).visit(F);
-}
-
-// Returns true if V is a function pointer
-bool FuncTransform::isFuncPtr(Value *V) {
-  if (const PointerType *PTy = dyn_cast(V->getType()))
-     return isa(PTy->getElementType());
-  return false;
-}
-
-// Given a function pointer, return the function eq. class if one exists
-Function* FuncTransform::getFuncClass(Value *V) {
-  // Look at DSGraph and see if the set of of functions it could point to
-  // are pool allocated.
-
-  if (!isFuncPtr(V))
-    return 0;
-
-  // Two cases: 
-  // if V is a constant
-  if (Function *theFunc = dyn_cast(V)) {
-    if (!PAInfo.FuncECs.findClass(theFunc))
-      // If this function does not belong to any equivalence class
-      return 0;
-    if (PAInfo.EqClass2LastPoolArg.count(PAInfo.FuncECs.findClass(theFunc)))
-      return PAInfo.FuncECs.findClass(theFunc);
-    else
-      return 0;
-  }
-
-  // if V is not a constant
-  DSNode *DSN = TDG.getNodeForValue(V).getNode();
-  if (!DSN) {
-    return 0;
-  }
-  const std::vector &Callees = DSN->getGlobals();
-  if (Callees.size() > 0) {
-    Function *calledF = dyn_cast(*Callees.begin());
-    assert(PAInfo.FuncECs.findClass(calledF) && "should exist in some eq. class");
-    if (PAInfo.EqClass2LastPoolArg.count(PAInfo.FuncECs.findClass(calledF)))
-      return PAInfo.FuncECs.findClass(calledF);
-  }
-
-  return 0;
-}
+// processFunction - Pool allocate any data structures which are contained in
+// the specified function...
+//
+void PoolAllocate::ProcessFunctionBody(Function &F, Function &NewF) {
+  DSGraph &G = BU->getDSGraph(F);
 
-// Returns the clone if  V is a static function (not a pointer) and belongs 
-// to an equivalence class i.e. is pool allocated
-Value* FuncTransform::retCloneIfFunc(Value *V) {
-  if (Function *fixedFunc = dyn_cast(V))
-    if (getFuncClass(V))
-      return PAInfo.getFuncInfo(*fixedFunc)->Clone;
+  std::vector &Nodes = G.getNodes();
+  if (Nodes.empty()) return;     // Quick exit if nothing to do...
   
-  return 0;
-}
-
-void FuncTransform::visitReturnInst (ReturnInst &RI) {
-  if (RI.getNumOperands())
-    if (Value *clonedFunc = retCloneIfFunc(RI.getOperand(0))) {
-      // Cast the clone of RI.getOperand(0) to the non-pool-allocated type
-      CastInst *CastI = new CastInst(clonedFunc, RI.getOperand(0)->getType(), 
-				     "tmp", &RI);
-      // Insert return instruction that returns the casted value
-      ReturnInst *RetI = new ReturnInst(CastI, &RI);
-
-      // Remove original return instruction
-      RI.getParent()->getInstList().erase(&RI);
-
-      if (!FI.NewToOldValueMap.empty()) {
-	std::map::iterator II =
-	  FI.NewToOldValueMap.find(&RI);
-	assert(II != FI.NewToOldValueMap.end() && 
-	       "RI not found in clone?");
-	FI.NewToOldValueMap.insert(std::make_pair(RetI, II->second));
-	FI.NewToOldValueMap.erase(II);
-      }
-    }
-}
-
-void FuncTransform::visitStoreInst (StoreInst &SI) {
-  // Check if a constant function is being stored
-  if (Value *clonedFunc = retCloneIfFunc(SI.getOperand(0))) {
-    CastInst *CastI = new CastInst(clonedFunc, SI.getOperand(0)->getType(), 
-				   "tmp", &SI);
-    StoreInst *StoreI = new StoreInst(CastI, SI.getOperand(1), &SI);
-    SI.getParent()->getInstList().erase(&SI);
-    
-    // Update the NewToOldValueMap if this is a clone
-    if (!FI.NewToOldValueMap.empty()) {
-      std::map::iterator II =
-	FI.NewToOldValueMap.find(&SI);
-      assert(II != FI.NewToOldValueMap.end() && 
-	     "SI not found in clone?");
-      FI.NewToOldValueMap.insert(std::make_pair(StoreI, II->second));
-      FI.NewToOldValueMap.erase(II);
-    }
-  }
-}
-
-void FuncTransform::visitPHINode(PHINode &PI) {
-  // If any of the operands of the PHI node is a constant function pointer
-  // that is cloned, the cast instruction has to be inserted at the end of the
-  // previous basic block
-  
-  if (isFuncPtr(&PI)) {
-    PHINode *V = new PHINode(PI.getType(), PI.getName(), &PI);
-    for (unsigned i = 0 ; i < PI.getNumIncomingValues(); ++i) {
-      if (Value *clonedFunc = retCloneIfFunc(PI.getIncomingValue(i))) {
-	// Insert CastInst at the end of  PI.getIncomingBlock(i)
-	BasicBlock::iterator BBI = --PI.getIncomingBlock(i)->end();
-	// BBI now points to the terminator instruction of the basic block.
-	CastInst *CastI = new CastInst(clonedFunc, PI.getType(), "tmp", BBI);
-	V->addIncoming(CastI, PI.getIncomingBlock(i));
-      } else {
-	V->addIncoming(PI.getIncomingValue(i), PI.getIncomingBlock(i));
-      }
-      
-    }
-    PI.replaceAllUsesWith(V);
-    PI.getParent()->getInstList().erase(&PI);
-    
-    DSGraph::ScalarMapTy &SM = G.getScalarMap();
-    DSGraph::ScalarMapTy::iterator PII = SM.find(&PI); 
-
-    // Update Scalar map of DSGraph if this is one of the original functions
-    // Otherwise update the NewToOldValueMap
-    if (PII != SM.end()) {
-      SM.insert(std::make_pair(V, PII->second));
-      SM.erase(PII);                     // Destroy the PHINode
-    } else {
-      std::map::iterator II =
-	FI.NewToOldValueMap.find(&PI);
-      assert(II != FI.NewToOldValueMap.end() && 
-	     "PhiI not found in clone?");
-      FI.NewToOldValueMap.insert(std::make_pair(V, II->second));
-      FI.NewToOldValueMap.erase(II);
-    }
-  }
-}
-
-void FuncTransform::visitMallocInst(MallocInst &MI) {
-  // Get the pool handle for the node that this contributes to...
-  Value *PH = getPoolHandle(&MI);
+  FuncInfo &FI = FunctionInfo[&F];   // Get FuncInfo for F
+  hash_set &MarkedNodes = FI.MarkedNodes;
   
-  // NB: PH is zero even if the node is collapsed
-  if (PH == 0) return;
-
-  std::string Name = MI.getName(); MI.setName("");
-
-  // Insert a call to poolalloc
-  TargetData &TD = PAInfo.getAnalysis();
-  Value *AllocSize =
-    ConstantUInt::get(Type::UIntTy, TD.getTypeSize(MI.getAllocatedType()));
-
-  if (MI.isArrayAllocation())
-    AllocSize = BinaryOperator::create(Instruction::Mul, AllocSize,
-                                       MI.getOperand(0), "sizetmp", &MI);
-
-  Value *V = new CallInst(PAInfo.PoolAlloc, make_vector(PH, AllocSize, 0),
-                          Name, &MI);
-
-  const Type *phtype = MI.getType()->getElementType();
-  std::map &PoolDescType = FI.PoolDescType;
-  if (!PoolDescType.count(PH))
-    PoolDescType[PH] = phtype;
-
-  Value *Casted = V;
-
-  // Cast to the appropriate type if necessary
-  if (V->getType() != MI.getType())
-    Casted = new CastInst(V, MI.getType(), V->getName(), &MI);
-    
-  // Update def-use info
-  MI.replaceAllUsesWith(Casted);
-
-  // Remove old malloc instruction
-  MI.getParent()->getInstList().erase(&MI);
+  DEBUG(std::cerr << "[" << F.getName() << "] Pool Allocate: ");
   
-  DSGraph::ScalarMapTy &SM = G.getScalarMap();
-  DSGraph::ScalarMapTy::iterator MII = SM.find(&MI);
+  // Loop over all of the nodes which are non-escaping, adding pool-allocatable
+  // ones to the NodesToPA vector.
+  std::vector NodesToPA;
+  for (unsigned i = 0, e = Nodes.size(); i != e; ++i)
+    if (Nodes[i]->isHeapNode() &&   // Pick nodes with heap elems
+        !MarkedNodes.count(Nodes[i]))              // Can't be marked
+      NodesToPA.push_back(Nodes[i]);
   
-  // If we are modifying the original function, update the DSGraph... 
-  if (MII != SM.end()) {
-    // V and Casted now point to whatever the original malloc did...
-    SM.insert(std::make_pair(V, MII->second));
-    if (V != Casted)
-      SM.insert(std::make_pair(Casted, MII->second));
-    SM.erase(MII);                     // The malloc is now destroyed
-  } else {             // Otherwise, update the NewToOldValueMap
-    std::map::iterator MII =
-      FI.NewToOldValueMap.find(&MI);
-    assert(MII != FI.NewToOldValueMap.end() && "MI not found in clone?");
-    FI.NewToOldValueMap.insert(std::make_pair(V, MII->second));
-    if (V != Casted)
-      FI.NewToOldValueMap.insert(std::make_pair(Casted, MII->second));
-    FI.NewToOldValueMap.erase(MII);
-  }
-}
-
-void FuncTransform::visitFreeInst(FreeInst &FrI) {
-  Value *Arg = FrI.getOperand(0);
-  Value *PH = getPoolHandle(Arg);  // Get the pool handle for this DSNode...
-  if (PH == 0) return;
-
-  const Type *phtype = 0;
-  if (const PointerType * ptype = dyn_cast(Arg->getType())) {
-    phtype = ptype->getElementType();
-  }
-  assert((phtype != 0) && "Needs to be implemented \n ");
-  std::map &PoolDescType = FI.PoolDescType;
-  if (!PoolDescType.count(PH))
-    PoolDescType[PH] = phtype;
-  
-  // Insert a cast and a call to poolfree...
-  Value *Casted = Arg;
-  if (Arg->getType() != PointerType::get(Type::SByteTy))
-    Casted = new CastInst(Arg, PointerType::get(Type::SByteTy),
-				 Arg->getName()+".casted", &FrI);
-
-  CallInst *FreeI = new CallInst(PAInfo.PoolFree, make_vector(PH, Casted, 0), 
-				 "", &FrI);
-  // Delete the now obsolete free instruction...
-  FrI.getParent()->getInstList().erase(&FrI);
-  
-  // Update the NewToOldValueMap if this is a clone
-  if (!FI.NewToOldValueMap.empty()) {
-    std::map::iterator II =
-      FI.NewToOldValueMap.find(&FrI);
-    assert(II != FI.NewToOldValueMap.end() && 
-	   "FrI not found in clone?");
-    FI.NewToOldValueMap.insert(std::make_pair(FreeI, II->second));
-    FI.NewToOldValueMap.erase(II);
-  }
-}
-
-static void CalcNodeMapping(DSNodeHandle& Caller, DSNodeHandle& Callee,
-                            std::map &NodeMapping) {
-  DSNode *CalleeNode = Callee.getNode();
-  DSNode *CallerNode = Caller.getNode();
-
-  unsigned CalleeOffset = Callee.getOffset();
-  unsigned CallerOffset = Caller.getOffset();
-
-  if (CalleeNode == 0) return;
-
-  // If callee has a node and caller doesn't, then a constant argument was
-  // passed by the caller
-  if (CallerNode == 0) {
-    NodeMapping.insert(NodeMapping.end(), std::make_pair(CalleeNode, 
-							 (DSNode *) 0));
-  }
-
-  // Map the callee node to the caller node. 
-  // NB: The callee node could be of a different type. Eg. if it points to the
-  // field of a struct that the caller points to
-  std::map::iterator I = NodeMapping.find(CalleeNode);
-  if (I != NodeMapping.end()) {   // Node already in map...
-    assert(I->second == CallerNode && 
-	   "Node maps to different nodes on paths?");
-  } else {
-    NodeMapping.insert(I, std::make_pair(CalleeNode, CallerNode));
-    
-    if (CalleeNode->getType() != CallerNode->getType() && CallerOffset == 0) 
-      DEBUG(std::cerr << "NB: Mapping of nodes between different types\n");
-
-    // Recursively map the callee links to the caller links starting from the
-    // offset in the node into which they are mapped.
-    // Being a BU Graph, the callee ought to have smaller number of links unless
-    // there is collapsing in the caller
-    unsigned numCallerLinks = CallerNode->getNumLinks() - CallerOffset;
-    unsigned numCalleeLinks = CalleeNode->getNumLinks() - CalleeOffset;
-    
-    if (numCallerLinks > 0) {
-      if (numCallerLinks < numCalleeLinks) {
-	DEBUG(std::cerr << "Potential node collapsing in caller\n");
-	for (unsigned i = 0, e = numCalleeLinks; i != e; ++i)
-	  CalcNodeMapping(CallerNode->getLink(((i%numCallerLinks) << DS::PointerShift) + CallerOffset), CalleeNode->getLink((i << DS::PointerShift) + CalleeOffset), NodeMapping);
-      } else {
-	for (unsigned i = 0, e = numCalleeLinks; i != e; ++i)
-	  CalcNodeMapping(CallerNode->getLink((i << DS::PointerShift) + CallerOffset), CalleeNode->getLink((i << DS::PointerShift) + CalleeOffset), NodeMapping);
-      }
-    } else if (numCalleeLinks > 0) {
-      DEBUG(std::cerr << 
-	    "Caller has unexpanded node, due to indirect call perhaps!\n");
-    }
+  DEBUG(std::cerr << NodesToPA.size() << " nodes to pool allocate\n");
+  if (!NodesToPA.empty()) {
+    // Create pool construction/destruction code
+    std::map &PoolDescriptors = FI.PoolDescriptors;
+    std::map &PoolDescTypeMap = FI.PoolDescType;
+    CreatePools(NewF, NodesToPA, PoolDescriptors, PoolDescTypeMap);
   }
+  
+  // Transform the body of the function now... collecting information about uses
+  // of the pools.
+  std::set PoolUses;
+  std::set PoolFrees;
+  TransformBody(G, TDDS->getDSGraph(F), FI, PoolUses, PoolFrees, NewF);
 }
 
-void FuncTransform::visitCallSite(CallSite CS) {
-  Function *CF = CS.getCalledFunction();
-  Instruction *TheCall = CS.getInstruction();
-
-  // optimization for function pointers that are basically gotten from a cast
-  // with only one use and constant expressions with casts in them
-  if (!CF) {
-    Value *CV = CS.getCalledValue();
-    if (CastInst* CastI = dyn_cast(CV)) {
-      if (isa(CastI->getOperand(0)) && 
-	  CastI->getOperand(0)->getType() == CastI->getType())
-	CF = dyn_cast(CastI->getOperand(0));
-    } else if (ConstantExpr *CE = dyn_cast(CV)) {
-      if (CE->getOpcode() == Instruction::Cast)
-	if (ConstantPointerRef *CPR
-            = dyn_cast(CE->getOperand(0)))
-          CF = dyn_cast(CPR->getValue());
-    }
-  }
-
-  DSGraph &CallerG = G;
-
-  std::vector Args;  
-
-  // We need to figure out which local pool descriptors correspond to the pool
-  // descriptor arguments passed into the function call.  Calculate a mapping
-  // from callee DSNodes to caller DSNodes.  We construct a partial isomophism
-  // between the graphs to figure out which pool descriptors need to be passed
-  // in.  The roots of this mapping is found from arguments and return values.
-  //
-  std::map NodeMapping;
-
-  if (!CF) {   // Indirect call
-    DEBUG(std::cerr << "  Handling call: " << *TheCall);
-    
-    std::map PoolArgs;
-    Function *FuncClass;
-    
-    std::pair::iterator,
-              std::multimap::iterator> Targets =
-      PAInfo.CallSiteTargets.equal_range(CS);
-    for (std::multimap::iterator TFI = Targets.first,
-	   TFE = Targets.second; TFI != TFE; ++TFI) {
-      if (TFI == Targets.first) {
-	FuncClass = PAInfo.FuncECs.findClass(TFI->second);
-	// Nothing to transform if there are no pool arguments in this
-	// equivalence class of functions.
-	if (!PAInfo.EqClass2LastPoolArg.count(FuncClass))
-	  return;
-      }
-      
-      FuncInfo *CFI = PAInfo.getFuncInfo(*TFI->second);
-
-      if (!CFI->ArgNodes.size()) continue;  // Nothing to transform...
-      
-      DSGraph &CG = PAInfo.getBUDataStructures().getDSGraph(*TFI->second);  
-      
-      {
-        Function::aiterator FAI = TFI->second->abegin(),E = TFI->second->aend();
-        CallSite::arg_iterator AI = CS.arg_begin(), AE = CS.arg_end();
-        for ( ; FAI != E && AI != AE; ++FAI, ++AI)
-          if (!isa(*AI))
-            CalcNodeMapping(getDSNodeHFor(*AI), CG.getScalarMap()[FAI],
-                            NodeMapping);
-        assert(AI == AE && "Varargs calls not handled yet!");
-      }
-      
-      if (TheCall->getType() != Type::VoidTy)
-        CalcNodeMapping(getDSNodeHFor(TheCall),
-                        CG.getReturnNodeFor(*TFI->second), NodeMapping);
-      
-      // Map the nodes that are pointed to by globals.
-      // For all globals map getDSNodeForGlobal(g)->CG.getDSNodeForGlobal(g)
-      for (DSGraph::ScalarMapTy::iterator SMI = G.getScalarMap().begin(), 
-             SME = G.getScalarMap().end(); SMI != SME; ++SMI)
-        if (isa(SMI->first)) { 
-          CalcNodeMapping(SMI->second, 
-                          CG.getScalarMap()[SMI->first], NodeMapping);
-        }
-
-      unsigned idx = CFI->PoolArgFirst;
-
-      // The following loop determines the pool pointers corresponding to 
-      // CFI.
-      for (unsigned i = 0, e = CFI->ArgNodes.size(); i != e; ++i, ++idx) {
-        if (NodeMapping.count(CFI->ArgNodes[i])) {
-          assert(NodeMapping.count(CFI->ArgNodes[i]) && "Node not in mapping!");
-          DSNode *LocalNode = NodeMapping.find(CFI->ArgNodes[i])->second;
-          if (LocalNode) {
-            assert(FI.PoolDescriptors.count(LocalNode) &&
-                   "Node not pool allocated?");
-            PoolArgs[idx] = FI.PoolDescriptors.find(LocalNode)->second;
-          }
-          else
-            // LocalNode is null when a constant is passed in as a parameter
-            PoolArgs[idx] = Constant::getNullValue(PoolDescPtr);
-        } else {
-          PoolArgs[idx] = Constant::getNullValue(PoolDescPtr);
-        }
-      }
-    }
-    
-    // Push the pool arguments into Args.
-    if (PAInfo.EqClass2LastPoolArg.count(FuncClass)) {
-      for (int i = 0; i <= PAInfo.EqClass2LastPoolArg[FuncClass]; ++i) {
-        if (PoolArgs.find(i) != PoolArgs.end())
-          Args.push_back(PoolArgs[i]);
-        else
-          Args.push_back(Constant::getNullValue(PoolDescPtr));
-      }
-    
-      assert(Args.size()== (unsigned) PAInfo.EqClass2LastPoolArg[FuncClass] + 1
-             && "Call has same number of pool args as the called function");
-    }
-
-    // Add the rest of the arguments (the original arguments of the function)...
-    Args.insert(Args.end(), CS.arg_begin(), CS.arg_end());
-    
-    std::string Name = TheCall->getName(); TheCall->setName("");
-    
-    Value *NewCall;
-    Value *CalledValuePtr = CS.getCalledValue();
-    if (Args.size() > (unsigned)CS.arg_size()) {
-      // If there are any pool arguments
-      CalledValuePtr = new CastInst(CS.getCalledValue(), 
-                       PAInfo.getFuncInfo(*FuncClass)->Clone->getType(), "tmp", 
-                                    TheCall);
-    }
-
-    if (InvokeInst *II = dyn_cast(TheCall)) {
-      NewCall = new InvokeInst(CalledValuePtr, II->getNormalDest(),
-                               II->getExceptionalDest(), Args, Name, TheCall);
-    } else {
-      NewCall = new CallInst(CalledValuePtr, Args, Name, TheCall);
-    }
-
-    TheCall->replaceAllUsesWith(NewCall);
-    DEBUG(std::cerr << "  Result Call: " << *NewCall);
-      
-    if (TheCall->getType() != Type::VoidTy) {
-      // If we are modifying the original function, update the DSGraph... 
-      DSGraph::ScalarMapTy &SM = G.getScalarMap();
-      DSGraph::ScalarMapTy::iterator CII = SM.find(TheCall);
-      if (CII != SM.end()) {
-	SM.insert(std::make_pair(NewCall, CII->second));
-	SM.erase(CII);                     // Destroy the CallInst
-      } else { 
-	// Otherwise update the NewToOldValueMap with the new CI return value
-	std::map::iterator CII = 
-	  FI.NewToOldValueMap.find(TheCall);
-	assert(CII != FI.NewToOldValueMap.end() && "CI not found in clone?");
-	FI.NewToOldValueMap.insert(std::make_pair(NewCall, CII->second));
-	FI.NewToOldValueMap.erase(CII);
-      }
-    } else if (!FI.NewToOldValueMap.empty()) {
-      std::map::iterator II =
-	FI.NewToOldValueMap.find(TheCall);
-      assert(II != FI.NewToOldValueMap.end() && 
-	     "CI not found in clone?");
-      FI.NewToOldValueMap.insert(std::make_pair(NewCall, II->second));
-      FI.NewToOldValueMap.erase(II);
-    }
-  } else {
-    FuncInfo *CFI = PAInfo.getFuncInfo(*CF);
-
-    if (CFI == 0 || CFI->Clone == 0) return;  // Nothing to transform...
-    
-    DEBUG(std::cerr << "  Handling call: " << *TheCall);
-    
-    DSGraph &CG = PAInfo.getBUDataStructures().getDSGraph(*CF);  // Callee graph
-
-    {
-      Function::aiterator FAI = CF->abegin(), E = CF->aend();
-      CallSite::arg_iterator AI = CS.arg_begin(), AE = CS.arg_end();
-      for ( ; FAI != E && AI != AE; ++FAI, ++AI)
-        if (!isa(*AI))
-          CalcNodeMapping(getDSNodeHFor(*AI), CG.getScalarMap()[FAI],
-                          NodeMapping);
-      assert(AI == AE && "Varargs calls not handled yet!");
-    }
-
-    // Map the return value as well...
-    if (TheCall->getType() != Type::VoidTy)
-      CalcNodeMapping(getDSNodeHFor(TheCall), CG.getReturnNodeFor(*CF),
-		      NodeMapping);
-
-    // Map the nodes that are pointed to by globals.
-    // For all globals map getDSNodeForGlobal(g)->CG.getDSNodeForGlobal(g)
-    for (DSGraph::ScalarMapTy::iterator SMI = G.getScalarMap().begin(), 
-	   SME = G.getScalarMap().end(); SMI != SME; ++SMI)
-      if (isa(SMI->first)) 
-	CalcNodeMapping(SMI->second, 
-			CG.getScalarMap()[SMI->first], NodeMapping);
-
-    // Okay, now that we have established our mapping, we can figure out which
-    // pool descriptors to pass in...
-
-    // Add an argument for each pool which must be passed in...
-    if (CFI->PoolArgFirst != 0) {
-      for (int i = 0; i < CFI->PoolArgFirst; ++i)
-	Args.push_back(Constant::getNullValue(PoolDescPtr));  
-    }
-
-    for (unsigned i = 0, e = CFI->ArgNodes.size(); i != e; ++i) {
-      if (NodeMapping.count(CFI->ArgNodes[i])) {
-
-	DSNode *LocalNode = NodeMapping.find(CFI->ArgNodes[i])->second;
-	if (LocalNode) {
-	  assert(FI.PoolDescriptors.count(LocalNode) &&
-                 "Node not pool allocated?");
-	  Args.push_back(FI.PoolDescriptors.find(LocalNode)->second);
-	} else
-	  Args.push_back(Constant::getNullValue(PoolDescPtr));
-      } else {
-	Args.push_back(Constant::getNullValue(PoolDescPtr));
-      }
-    }
-
-    Function *FuncClass = PAInfo.FuncECs.findClass(CF);
-    
-    if (PAInfo.EqClass2LastPoolArg.count(FuncClass))
-      for (int i = CFI->PoolArgLast; 
-	   i <= PAInfo.EqClass2LastPoolArg[FuncClass]; ++i)
-	Args.push_back(Constant::getNullValue(PoolDescPtr));
-
-    // Add the rest of the arguments...
-    Args.insert(Args.end(), CS.arg_begin(), CS.arg_end());
-    
-    std::string Name = TheCall->getName(); TheCall->setName("");
-
-    Value *NewCall;
-    if (InvokeInst *II = dyn_cast(TheCall)) {
-      NewCall = new InvokeInst(CFI->Clone, II->getNormalDest(),
-                               II->getExceptionalDest(), Args, Name, TheCall);
-    } else {
-      NewCall = new CallInst(CFI->Clone, Args, Name, TheCall);
-    }
-
-    TheCall->replaceAllUsesWith(NewCall);
-    DEBUG(std::cerr << "  Result Call: " << *NewCall);
-
-    if (TheCall->getType() != Type::VoidTy) {
-      // If we are modifying the original function, update the DSGraph... 
-      DSGraph::ScalarMapTy &SM = G.getScalarMap();
-      DSGraph::ScalarMapTy::iterator CII = SM.find(TheCall); 
-      if (CII != SM.end()) {
-	SM.insert(std::make_pair(NewCall, CII->second));
-	SM.erase(CII);                     // Destroy the CallInst
-      } else { 
-	// Otherwise update the NewToOldValueMap with the new CI return value
-	std::map::iterator CNII = 
-	  FI.NewToOldValueMap.find(TheCall);
-	assert(CNII != FI.NewToOldValueMap.end() && CNII->second && 
-	       "CI not found in clone?");
-	FI.NewToOldValueMap.insert(std::make_pair(NewCall, CNII->second));
-	FI.NewToOldValueMap.erase(CNII);
-      }
-    } else if (!FI.NewToOldValueMap.empty()) {
-      std::map::iterator II =
-	FI.NewToOldValueMap.find(TheCall);
-      assert(II != FI.NewToOldValueMap.end() && "CI not found in clone?");
-      FI.NewToOldValueMap.insert(std::make_pair(NewCall, II->second));
-      FI.NewToOldValueMap.erase(II);
-    }
-  }
-
-  TheCall->getParent()->getInstList().erase(TheCall);
-}




From lattner at cs.uiuc.edu  Sun Nov  9 16:17:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 16:17:01 2003
Subject: [llvm-commits] CVS: poolalloc/include/poolalloc/PoolAllocate.h
Message-ID: <200311092216.QAA18811@zion.cs.uiuc.edu>


Changes in directory poolalloc/include/poolalloc:

PoolAllocate.h updated: 1.8 -> 1.9

---
Log message:

Changes to split files


---
Diffs of the changes:  (+7 -3)

Index: poolalloc/include/poolalloc/PoolAllocate.h
diff -u poolalloc/include/poolalloc/PoolAllocate.h:1.8 poolalloc/include/poolalloc/PoolAllocate.h:1.9
--- poolalloc/include/poolalloc/PoolAllocate.h:1.8	Sun Nov  2 17:49:25 2003
+++ poolalloc/include/poolalloc/PoolAllocate.h	Sun Nov  9 16:16:47 2003
@@ -16,6 +16,7 @@
 #include "Support/hash_set"
 #include "Support/VectorExtras.h"
 #include "Support/EquivalenceClasses.h"
+#include 
 
 class BUDataStructures;
 class TDDataStructures;
@@ -97,6 +98,7 @@
  public:
 
   Function *PoolInit, *PoolDestroy, *PoolAlloc, *PoolAllocArray, *PoolFree;
+  static const Type *PoolDescPtrTy;
 
   // Equivalence class where functions that can potentially be called via
   // the same function pointer are in the same class.
@@ -174,11 +176,13 @@
                    std::map &PoolDescriptors,
 		   std::map &PoolDescTypeMap);
   
-  void TransformFunctionBody(Function &F, Function &OldF,
-                             DSGraph &G, PA::FuncInfo &FI);
-
   void InlineIndirectCalls(Function &F, DSGraph &G, 
 			   hash_set &visited);
+
+  void TransformBody(DSGraph &g, DSGraph &tdg, PA::FuncInfo &fi,
+                     std::set &poolUses,
+                     std::set &poolFrees,
+                     Function &F);
 };
 
 #endif




From gaeke at cs.uiuc.edu  Sun Nov  9 16:44:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 16:44:01 2003
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200311092243.QAA22292@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.19 -> 1.20

---
Log message:

Remove some include files.


---
Diffs of the changes:  (+0 -3)

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.19 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.20
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.19	Sat Nov  8 23:30:26 2003
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Sun Nov  9 16:43:36 2003
@@ -9,14 +9,11 @@
 #include "../../../../lib/CodeGen/RegAlloc/AllocInfo.h"
 #include "../../../../lib/CodeGen/RegAlloc/PhyRegAlloc.h"
 #include "../../../../lib/Target/Sparc/SparcInternals.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Module.h"
-#include "reopt/ScratchMemory.h"
 #include "reopt/MappingInfo.h"
-#include "Support/Debug.h"
 
 /// Insert the appropriate machine instruction(s) that copies the value in
 /// Source to the location specified by Target, at the beginning of B. Note




From lattner at cs.uiuc.edu  Sun Nov  9 16:47:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 16:47:01 2003
Subject: [llvm-commits] CVS: poolalloc/include/poolalloc/PoolAllocate.h
Message-ID: <200311092246.QAA20936@zion.cs.uiuc.edu>


Changes in directory poolalloc/include/poolalloc:

PoolAllocate.h updated: 1.9 -> 1.10

---
Log message:

Uh, these sets where thinko'd.  Fix them


---
Diffs of the changes:  (+3 -2)

Index: poolalloc/include/poolalloc/PoolAllocate.h
diff -u poolalloc/include/poolalloc/PoolAllocate.h:1.9 poolalloc/include/poolalloc/PoolAllocate.h:1.10
--- poolalloc/include/poolalloc/PoolAllocate.h:1.9	Sun Nov  9 16:16:47 2003
+++ poolalloc/include/poolalloc/PoolAllocate.h	Sun Nov  9 16:46:35 2003
@@ -23,6 +23,7 @@
 class DSNode;
 class DSGraph;
 class Type;
+class AllocaInst;
 
 namespace PA {
   /// FuncInfo - Represent the pool allocation information for one function in
@@ -180,8 +181,8 @@
 			   hash_set &visited);
 
   void TransformBody(DSGraph &g, DSGraph &tdg, PA::FuncInfo &fi,
-                     std::set &poolUses,
-                     std::set &poolFrees,
+                     std::set > &poolUses,
+                     std::set > &poolFrees,
                      Function &F);
 };
 




From lattner at cs.uiuc.edu  Sun Nov  9 16:47:10 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 16:47:10 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp TransformFunctionBody.cpp
Message-ID: <200311092246.QAA20914@zion.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.33 -> 1.34
TransformFunctionBody.cpp updated: 1.1 -> 1.2

---
Log message:

Uh, these sets where thinko'd.  Fix them


---
Diffs of the changes:  (+10 -9)

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.33 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.34
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.33	Sun Nov  9 16:14:07 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Sun Nov  9 16:46:25 2003
@@ -570,8 +570,8 @@
   
   // Transform the body of the function now... collecting information about uses
   // of the pools.
-  std::set PoolUses;
-  std::set PoolFrees;
+  std::set > PoolUses;
+  std::set > PoolFrees;
   TransformBody(G, TDDS->getDSGraph(F), FI, PoolUses, PoolFrees, NewF);
 }
 


Index: poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp
diff -u poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.1 poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.2
--- poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.1	Sun Nov  9 16:14:07 2003
+++ poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp	Sun Nov  9 16:46:25 2003
@@ -29,16 +29,17 @@
 
     // PoolUses - For each pool (identified by the pool descriptor) keep track
     // of which blocks require the memory in the pool to not be freed.  This
-    // does not include poolfree's.
-    std::set &PoolUses;
+    // does not include poolfree's.  Note that this is only tracked for pools
+    // which this is the home of, ie, they are Alloca instructions.
+    std::set > &PoolUses;
 
     // PoolDestroys - For each pool, keep track of the actual poolfree calls
     // inserted into the code.  This is seperated out from PoolUses.
-    std::set   &PoolFrees;
+    std::set > &PoolFrees;
 
     FuncTransform(PoolAllocate &P, DSGraph &g, DSGraph &tdg, FuncInfo &fi,
-                  std::set &poolUses,
-                  std::set &poolFrees)
+                  std::set > &poolUses,
+                  std::set > &poolFrees)
       : PAInfo(P), G(g), TDG(tdg), FI(fi),
         PoolUses(poolUses), PoolFrees(poolFrees) {
     }
@@ -125,8 +126,8 @@
 }
 
 void PoolAllocate::TransformBody(DSGraph &g, DSGraph &tdg, PA::FuncInfo &fi,
-                                 std::set &poolUses,
-                                 std::set &poolFrees,
+                       std::set > &poolUses,
+                       std::set > &poolFrees,
                                  Function &F) {
   FuncTransform(*this, g, tdg, fi, poolUses, poolFrees).visit(F);
 }




From lattner at cs.uiuc.edu  Sun Nov  9 17:37:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 17:37:01 2003
Subject: [llvm-commits] CVS: poolalloc/include/poolalloc/PoolAllocate.h
Message-ID: <200311092336.RAA22830@zion.cs.uiuc.edu>


Changes in directory poolalloc/include/poolalloc:

PoolAllocate.h updated: 1.10 -> 1.11

---
Log message:

Frob the set types AGAIN


---
Diffs of the changes:  (+1 -1)

Index: poolalloc/include/poolalloc/PoolAllocate.h
diff -u poolalloc/include/poolalloc/PoolAllocate.h:1.10 poolalloc/include/poolalloc/PoolAllocate.h:1.11
--- poolalloc/include/poolalloc/PoolAllocate.h:1.10	Sun Nov  9 16:46:35 2003
+++ poolalloc/include/poolalloc/PoolAllocate.h	Sun Nov  9 17:36:27 2003
@@ -181,7 +181,7 @@
 			   hash_set &visited);
 
   void TransformBody(DSGraph &g, DSGraph &tdg, PA::FuncInfo &fi,
-                     std::set > &poolUses,
+                     std::set > &poolUses,
                      std::set > &poolFrees,
                      Function &F);
 };




From lattner at cs.uiuc.edu  Sun Nov  9 17:37:11 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 17:37:11 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp TransformFunctionBody.cpp
Message-ID: <200311092336.RAA22821@zion.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.34 -> 1.35
TransformFunctionBody.cpp updated: 1.2 -> 1.3

---
Log message:

Keep track of all of the instructions using each pool


---
Diffs of the changes:  (+34 -9)

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.34 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.35
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.34	Sun Nov  9 16:46:25 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Sun Nov  9 17:36:16 2003
@@ -570,7 +570,7 @@
   
   // Transform the body of the function now... collecting information about uses
   // of the pools.
-  std::set > PoolUses;
+  std::set > PoolUses;
   std::set > PoolFrees;
   TransformBody(G, TDDS->getDSGraph(F), FI, PoolUses, PoolFrees, NewF);
 }


Index: poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp
diff -u poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.2 poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.3
--- poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.2	Sun Nov  9 16:46:25 2003
+++ poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp	Sun Nov  9 17:36:16 2003
@@ -31,19 +31,25 @@
     // of which blocks require the memory in the pool to not be freed.  This
     // does not include poolfree's.  Note that this is only tracked for pools
     // which this is the home of, ie, they are Alloca instructions.
-    std::set > &PoolUses;
+    std::set > &PoolUses;
 
     // PoolDestroys - For each pool, keep track of the actual poolfree calls
     // inserted into the code.  This is seperated out from PoolUses.
     std::set > &PoolFrees;
 
     FuncTransform(PoolAllocate &P, DSGraph &g, DSGraph &tdg, FuncInfo &fi,
-                  std::set > &poolUses,
+                  std::set > &poolUses,
                   std::set > &poolFrees)
       : PAInfo(P), G(g), TDG(tdg), FI(fi),
         PoolUses(poolUses), PoolFrees(poolFrees) {
     }
 
+    template 
+    void AddPoolUse(InstType &I, Value *PoolHandle, SetType &Set) {
+      if (AllocaInst *AI = dyn_cast(PoolHandle))
+        Set.insert(std::make_pair(AI, &I));
+    }
+
     void visitMallocInst(MallocInst &MI);
     void visitFreeInst(FreeInst &FI);
     void visitCallSite(CallSite CS);
@@ -58,10 +64,10 @@
     void visitSwitchInst (SwitchInst &I) { }
     void visitCastInst (CastInst &I) { }
     void visitAllocaInst(AllocaInst &I) { }
-    void visitLoadInst(LoadInst &I) { }
     void visitGetElementPtrInst (GetElementPtrInst &I) { }
 
     void visitReturnInst(ReturnInst &I);
+    void visitLoadInst(LoadInst &I);
     void visitStoreInst (StoreInst &I);
     void visitPHINode(PHINode &I);
 
@@ -126,7 +132,7 @@
 }
 
 void PoolAllocate::TransformBody(DSGraph &g, DSGraph &tdg, PA::FuncInfo &fi,
-                       std::set > &poolUses,
+                       std::set > &poolUses,
                        std::set > &poolFrees,
                                  Function &F) {
   FuncTransform(*this, g, tdg, fi, poolUses, poolFrees).visit(F);
@@ -209,6 +215,11 @@
     }
 }
 
+void FuncTransform::visitLoadInst(LoadInst &LI) {
+  if (Value *PH = getPoolHandle(LI.getOperand(0)))
+    AddPoolUse(LI, PH, PoolUses);
+}
+
 void FuncTransform::visitStoreInst (StoreInst &SI) {
   // Check if a constant function is being stored
   if (Value *clonedFunc = retCloneIfFunc(SI.getOperand(0))) {
@@ -227,6 +238,9 @@
       FI.NewToOldValueMap.erase(II);
     }
   }
+
+  if (Value *PH = getPoolHandle(SI.getOperand(1)))
+    AddPoolUse(SI, PH, PoolUses);
 }
 
 void FuncTransform::visitPHINode(PHINode &PI) {
@@ -277,6 +291,8 @@
   // NB: PH is zero even if the node is collapsed
   if (PH == 0) return;
 
+  AddPoolUse(MI, PH, PoolUses);
+
   std::string Name = MI.getName(); MI.setName("");
 
   // Insert a call to poolalloc
@@ -335,9 +351,9 @@
   if (PH == 0) return;
 
   const Type *phtype = 0;
-  if (const PointerType * ptype = dyn_cast(Arg->getType())) {
+  if (const PointerType *ptype = dyn_cast(Arg->getType()))
     phtype = ptype->getElementType();
-  }
+
   assert((phtype != 0) && "Needs to be implemented \n ");
   std::map &PoolDescType = FI.PoolDescType;
   if (!PoolDescType.count(PH))
@@ -353,6 +369,8 @@
 				 "", &FrI);
   // Delete the now obsolete free instruction...
   FrI.getParent()->getInstList().erase(&FrI);
+
+  AddPoolUse(*FreeI, PH, PoolFrees);
   
   // Update the NewToOldValueMap if this is a clone
   if (!FI.NewToOldValueMap.empty()) {
@@ -540,7 +558,6 @@
     
     std::string Name = TheCall->getName(); TheCall->setName("");
     
-    Value *NewCall;
     Value *CalledValuePtr = CS.getCalledValue();
     if (Args.size() > (unsigned)CS.arg_size()) {
       // If there are any pool arguments
@@ -549,12 +566,16 @@
                                     TheCall);
     }
 
+    Instruction *NewCall;
     if (InvokeInst *II = dyn_cast(TheCall)) {
       NewCall = new InvokeInst(CalledValuePtr, II->getNormalDest(),
                                II->getExceptionalDest(), Args, Name, TheCall);
     } else {
       NewCall = new CallInst(CalledValuePtr, Args, Name, TheCall);
     }
+    // Add all of the uses of the pool descriptor
+    for (unsigned i = 0, e = Args.size()-CS.arg_size(); i != e; ++i)
+      AddPoolUse(*NewCall, Args[i], PoolUses);
 
     TheCall->replaceAllUsesWith(NewCall);
     DEBUG(std::cerr << "  Result Call: " << *NewCall);
@@ -650,13 +671,17 @@
     
     std::string Name = TheCall->getName(); TheCall->setName("");
 
-    Value *NewCall;
+    Instruction *NewCall;
     if (InvokeInst *II = dyn_cast(TheCall)) {
       NewCall = new InvokeInst(CFI->Clone, II->getNormalDest(),
                                II->getExceptionalDest(), Args, Name, TheCall);
     } else {
       NewCall = new CallInst(CFI->Clone, Args, Name, TheCall);
     }
+
+    // Add all of the uses of the pool descriptor
+    for (unsigned i = 0, e = Args.size()-CS.arg_size(); i != e; ++i)
+      AddPoolUse(*NewCall, Args[i], PoolUses);
 
     TheCall->replaceAllUsesWith(NewCall);
     DEBUG(std::cerr << "  Result Call: " << *NewCall);




From gaeke at cs.uiuc.edu  Sun Nov  9 17:49:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 17:49:01 2003
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200311092349.RAA22764@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.20 -> 1.21

---
Log message:

Operand numbers are now ints


---
Diffs of the changes:  (+3 -3)

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.20 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.21
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.20	Sun Nov  9 16:43:36 2003
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Sun Nov  9 17:48:50 2003
@@ -87,7 +87,7 @@
 extern "C" { 
   struct OperandAllocState {
     unsigned Instruction;
-    unsigned Operand;
+    int Operand;
     unsigned AllocState;
     int Placement;
   };
@@ -141,7 +141,7 @@
   Instruction *Instr = cast (V);
   unsigned FI = getLLVMFunctionPositionInfo (F);
   unsigned VI = getSavedStateIndexOfInstruction (F, Instr);
-  unsigned VO = getSavedStateIndexOfOperandInInstruction (F, V, VI);
+  int VO = getSavedStateIndexOfOperandInInstruction (F, V, VI);
   // Reconstruct the AllocInfo for V by searching
   // _llvm_regAllocState.functions[FI] for a tuple that starts with
   // (VI, VO, ...):
@@ -172,7 +172,7 @@
   // Figure out the indices (VI, VO) that can be used to look up V, which is an
   // operand of some instruction in F, in FState:
   unsigned VI = getSavedStateIndexOfInstruction (F, Instr);
-  unsigned VO = getSavedStateIndexOfOperandInInstruction (F, V, VI);
+  int VO = getSavedStateIndexOfOperandInInstruction (F, V, VI);
   // Retrieve the AllocInfo for V by searching FState for a tuple that starts
   // with (VI, VO, ...):
   for (unsigned i = 0, s = FState.size (); i < s; ++i) {




From gaeke at cs.uiuc.edu  Sun Nov  9 17:49:12 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 17:49:12 2003
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/TraceToFunction.cpp
Message-ID: <200311092348.RAA22752@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

TraceToFunction.cpp updated: 1.14 -> 1.15

---
Log message:

Get rid of a few FIXMEs.


---
Diffs of the changes:  (+8 -9)

Index: reopt/lib/LightWtProfiling/TraceToFunction.cpp
diff -u reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.14 reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.15
--- reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.14	Mon Nov  3 01:03:30 2003
+++ reopt/lib/LightWtProfiling/TraceToFunction.cpp	Sun Nov  9 17:48:22 2003
@@ -6,8 +6,6 @@
 // TODO (also search for FIXME in this file):
 // 1) Only let things go into the LiveIn/Out sets for which we have register
 //    allocation information available. Otherwise abort.
-//    a) Also only let things go into the LiveOut sets which definitely define
-//       a value (e.g., not "call void ...")
 // 2) For each basic block that exits the trace, we need to keep track
 //    of the address that the "ret" instruction would have returned to.
 //    Use the mapping information (probably BB TO MI MAP) to translate
@@ -16,6 +14,9 @@
 // 3) a) Used before defined --> live-in and live-out: dui bu dui?
 //    b) Live in and not defined by trace --> not live out.
 //
+// Potential optimizations:
+// Get rid of BranchNumber
+//
 //===----------------------------------------------------------------------===//
 
 #include "TraceToFunction.h"
@@ -156,9 +157,9 @@
       Instruction &I = *BI;
       Value *V = &I;
       // I is an instruction in B, which is in the trace.
-      // (Does it define a value? FIXME)
-      if (!DefinedInTraceBeforeUse (V, T))
-	S.insert (&I);
+      if (V->getType () != Type::VoidTy) // Don't worry about void Values.
+        if (!DefinedInTraceBeforeUse (V, T))
+          S.insert (&I);
     }
   }
   return S;
@@ -273,8 +274,8 @@
     DEBUG(dstB->setName ("trace" + utostr(BBCount++)));
     // Add dstB to F.
     F->getBasicBlockList ().push_back (dstB);
-    // Remember the correspondence between srcB and dstB.
-    // FIXME: Should this be something that CloneBasicBlock does?
+    // Remember the correspondence between srcB and dstB. (CloneFunction does
+    // this, but we aren't cloning the whole function.)
     O2CMap[srcB] = dstB; 
   }
 }
@@ -475,8 +476,6 @@
 	}
 	// Make FB contain a return instruction that returns the
 	// number of the taken exit-branch. Add it to the end of FB:
-	// (FIXME: Numbering the branches in this way is probably
-	// unnecessary except in DEBUG mode.)
 	FB->getInstList ().push_back
 	  (new ReturnInst (ConstantUInt::get (Type::UIntTy,
 					      BranchNumber[BI])));




From gaeke at cs.uiuc.edu  Sun Nov  9 18:06:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 18:06:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/AllocInfo.h PhyRegAlloc.cpp PhyRegAlloc.h
Message-ID: <200311100005.SAA23344@seraph.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

AllocInfo.h updated: 1.3 -> 1.4
PhyRegAlloc.cpp updated: 1.127 -> 1.128
PhyRegAlloc.h updated: 1.60 -> 1.61

---
Log message:

Operand numbers are now ints. Save the register allocation of the value
each instruction produces as "operand" -1, and the other operands as 0
.. n, as before. PhyRegAlloc::saveState() is refactored into
PhyRegAlloc::saveStateForValue().


---
Diffs of the changes:  (+40 -30)

Index: llvm/lib/CodeGen/RegAlloc/AllocInfo.h
diff -u llvm/lib/CodeGen/RegAlloc/AllocInfo.h:1.3 llvm/lib/CodeGen/RegAlloc/AllocInfo.h:1.4
--- llvm/lib/CodeGen/RegAlloc/AllocInfo.h:1.3	Thu Oct 30 15:21:22 2003
+++ llvm/lib/CodeGen/RegAlloc/AllocInfo.h	Sun Nov  9 18:05:25 2003
@@ -25,7 +25,7 @@
 ///
 struct AllocInfo {
   unsigned Instruction;
-  unsigned Operand;
+  int Operand; // (-1 if Instruction, or 0...n-1 for an operand.)
   enum AllocStateTy { NotAllocated = 0, Allocated, Spilled };
   AllocStateTy AllocState;
   int Placement;
@@ -40,7 +40,7 @@
   static StructType *getConstantType () {
     std::vector TV;
     TV.push_back (Type::UIntTy);
-    TV.push_back (Type::UIntTy);
+    TV.push_back (Type::IntTy);
     TV.push_back (Type::UIntTy);
     TV.push_back (Type::IntTy);
     return StructType::get (TV);
@@ -53,7 +53,7 @@
     StructType *ST = getConstantType ();
     std::vector CV;
     CV.push_back (ConstantUInt::get (Type::UIntTy, Instruction));
-    CV.push_back (ConstantUInt::get (Type::UIntTy, Operand));
+    CV.push_back (ConstantSInt::get (Type::IntTy, Operand));
     CV.push_back (ConstantUInt::get (Type::UIntTy, AllocState));
     CV.push_back (ConstantSInt::get (Type::IntTy, Placement));
     return ConstantStruct::get (ST, CV);


Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.127 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.128
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.127	Tue Nov  4 16:42:41 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp	Sun Nov  9 18:05:25 2003
@@ -1137,6 +1137,31 @@
 }
 
 
+void PhyRegAlloc::saveStateForValue (std::vector &state,
+                                     const Value *V, unsigned Insn, int Opnd) {
+  LiveRangeMapType::const_iterator HMI = LRI->getLiveRangeMap ()->find (V); 
+  LiveRangeMapType::const_iterator HMIEnd = LRI->getLiveRangeMap ()->end ();   
+  AllocInfo::AllocStateTy AllocState = AllocInfo::NotAllocated; 
+  int Placement = -1; 
+  if ((HMI != HMIEnd) && HMI->second) { 
+    LiveRange *L = HMI->second; 
+    assert ((L->hasColor () || L->isMarkedForSpill ()) 
+            && "Live range exists but not colored or spilled"); 
+    if (L->hasColor ()) { 
+      AllocState = AllocInfo::Allocated; 
+      Placement = MRI.getUnifiedRegNum (L->getRegClassID (), 
+                                        L->getColor ()); 
+    } else if (L->isMarkedForSpill ()) { 
+      AllocState = AllocInfo::Spilled; 
+      assert (L->hasSpillOffset () 
+              && "Live range marked for spill but has no spill offset"); 
+      Placement = L->getSpillOffFromFP (); 
+    } 
+  } 
+  state.push_back (AllocInfo (Insn, Opnd, AllocState, Placement)); 
+}
+
+
 /// Save the global register allocation decisions made by the register
 /// allocator so that they can be accessed later (sort of like "poor man's
 /// debug info").
@@ -1144,32 +1169,14 @@
 void PhyRegAlloc::saveState () {
   std::vector &state = FnAllocState[Fn];
   unsigned Insn = 0;
-  LiveRangeMapType::const_iterator HMIEnd = LRI->getLiveRangeMap ()->end ();   
   for (const_inst_iterator II=inst_begin (Fn), IE=inst_end (Fn); II!=IE; ++II){
+    saveStateForValue (state, (*II), Insn, -1);
     for (unsigned i = 0; i < (*II)->getNumOperands (); ++i) {
       const Value *V = (*II)->getOperand (i);
-      // Don't worry about it unless it's something whose reg. we'll need.
-      if (!isa (V) && !isa (V))
-        continue;
-      LiveRangeMapType::const_iterator HMI = LRI->getLiveRangeMap ()->find (V);
-      AllocInfo::AllocStateTy AllocState = AllocInfo::NotAllocated;
-      int Placement = -1;
-      if ((HMI != HMIEnd) && HMI->second) {
-        LiveRange *L = HMI->second;
-        assert ((L->hasColor () || L->isMarkedForSpill ())
-                && "Live range exists but not colored or spilled");
-        if (L->hasColor()) {
-          AllocState = AllocInfo::Allocated;
-          Placement = MRI.getUnifiedRegNum (L->getRegClassID (),
-                                            L->getColor ());
-        } else if (L->isMarkedForSpill ()) {
-          AllocState = AllocInfo::Spilled;
-          assert (L->hasSpillOffset ()
-                  && "Live range marked for spill but has no spill offset");
-          Placement = L->getSpillOffFromFP ();
-        }
-      }
-      state.push_back (AllocInfo (Insn, i, AllocState, Placement));
+      // Don't worry about it unless it's something whose reg. we'll need. 
+      if (!isa (V) && !isa (V)) 
+        continue; 
+      saveStateForValue (state, V, Insn, i);
     }
     ++Insn;
   }
@@ -1209,7 +1216,7 @@
 /// Finish the job of saveState(), by collapsing FnAllocState into an LLVM
 /// Constant and stuffing it inside the Module. (NOTE: Soon, there will be
 /// other, better ways of storing the saved state; this one is cumbersome and
-/// will never work with the JIT.)
+/// does not work well with the JIT.)
 ///
 bool PhyRegAlloc::doFinalization (Module &M) { 
   if (!SaveRegAllocState)
@@ -1261,8 +1268,8 @@
                             GlobalValue::InternalLinkage, S,
                             F->getName () + ".regAllocState", &M);
 
-      // Have: { uint, [Size x { uint, uint, uint, int }] } *
-      // Cast it to: { uint, [0 x { uint, uint, uint, int }] } *
+      // Have: { uint, [Size x { uint, int, uint, int }] } *
+      // Cast it to: { uint, [0 x { uint, int, uint, int }] } *
       Constant *CE = ConstantExpr::getCast (ConstantPointerRef::get (GV), PT);
       allstate.push_back (CE);
     }
@@ -1270,7 +1277,7 @@
 
   unsigned Size = allstate.size ();
   // Final structure type is:
-  // { uint, [Size x { uint, [0 x { uint, uint, uint, int }] } *] }
+  // { uint, [Size x { uint, [0 x { uint, int, uint, int }] } *] }
   std::vector TV2;
   TV2.push_back (Type::UIntTy);
   ArrayType *AT2 = ArrayType::get (PT, Size);


Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h:1.60 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h:1.61
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h:1.60	Fri Oct 24 16:21:58 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.h	Sun Nov  9 18:05:26 2003
@@ -122,6 +122,9 @@
   void addInterferencesForArgs();
   void createIGNodeListsAndIGs();
   void buildInterferenceGraphs();
+
+  void saveStateForValue (std::vector &state,
+                          const Value *V, unsigned Insn, int Opnd);
   void saveState();
   void verifySavedState();
 




From lattner at cs.uiuc.edu  Sun Nov  9 18:14:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 18:14:01 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp
Message-ID: <200311100013.SAA24349@zion.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

TransformFunctionBody.cpp updated: 1.3 -> 1.4

---
Log message:

Don't crash!


---
Diffs of the changes:  (+4 -5)

Index: poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp
diff -u poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.3 poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.4
--- poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.3	Sun Nov  9 17:36:16 2003
+++ poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp	Sun Nov  9 18:13:04 2003
@@ -111,12 +111,11 @@
 	// Check that the node pointed to by V in the TD DS graph is not
 	// collapsed
 	DSNode *TDNode = getTDDSNodeHFor(V).getNode();
-	if (TDNode->getType() != Type::VoidTy)
+	if (TDNode && TDNode->getType() != Type::VoidTy)
 	  return I->second;
-	else {
-	  PAInfo.CollapseFlag = 1;
-	  return 0;
-	}
+
+        PAInfo.CollapseFlag = 1;
+        return 0;
       }
       else
 	return 0;




From lattner at cs.uiuc.edu  Sun Nov  9 18:14:11 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 18:14:11 2003
Subject: [llvm-commits] CVS: poolalloc/include/poolalloc/PoolAllocate.h
Message-ID: <200311100013.SAA24339@zion.cs.uiuc.edu>


Changes in directory poolalloc/include/poolalloc:

PoolAllocate.h updated: 1.11 -> 1.12

---
Log message:

Split createpools, making a new InitializeAndDestroyPools method


---
Diffs of the changes:  (+12 -3)

Index: poolalloc/include/poolalloc/PoolAllocate.h
diff -u poolalloc/include/poolalloc/PoolAllocate.h:1.11 poolalloc/include/poolalloc/PoolAllocate.h:1.12
--- poolalloc/include/poolalloc/PoolAllocate.h:1.11	Sun Nov  9 17:36:27 2003
+++ poolalloc/include/poolalloc/PoolAllocate.h	Sun Nov  9 18:12:53 2003
@@ -169,9 +169,9 @@
   ///
   void ProcessFunctionBody(Function &Old, Function &New);
   
-  /// CreatePools - This creates the pool initialization and destruction code
-  /// for the DSNodes specified by the NodesToPA list.  This adds an entry to
-  /// the PoolDescriptors map for each DSNode.
+  /// CreatePools - This inserts alloca instruction in the function for all
+  /// pools specified in the NodesToPA list.  This adds an entry to the
+  /// PoolDescriptors map for each DSNode.
   ///
   void CreatePools(Function &F, const std::vector &NodesToPA,
                    std::map &PoolDescriptors,
@@ -184,6 +184,15 @@
                      std::set > &poolUses,
                      std::set > &poolFrees,
                      Function &F);
+
+  /// InitializeAndDestroyPools - This inserts calls to poolinit and pooldestroy
+  /// into the function to initialize and destroy the pools in the NodesToPA
+  /// list.
+  void InitializeAndDestroyPools(Function &F,
+                                 const std::vector &NodesToPA,
+                                 std::map &PoolDescriptors,
+                                 std::map &PoolDescTypeMap);
 };
 
 #endif




From lattner at cs.uiuc.edu  Sun Nov  9 18:15:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 18:15:01 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200311100014.SAA24360@zion.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.35 -> 1.36

---
Log message:

Just for fun, split CreatePools, making a new InitializeAndDestroyPools method,
which is run AFTER the function is transformed, not before.

This does not change functionality, but allows future mods.  :)


---
Diffs of the changes:  (+56 -30)

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.35 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.36
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.35	Sun Nov  9 17:36:16 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Sun Nov  9 18:13:55 2003
@@ -490,13 +490,6 @@
                                std::map &PoolDescriptors,
 			       std::map &PoolDescTypeMap) {
-  // Find all of the return nodes in the CFG...
-  std::vector ReturnNodes;
-  for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I)
-    if (isa(I->getTerminator()))
-      ReturnNodes.push_back(I);
-
-  TargetData &TD = getAnalysis();
 
   // Loop over all of the pools, inserting code into the entry block of the
   // function for the initialization and code in the exit blocks for
@@ -508,31 +501,17 @@
     
     // Create a new alloca instruction for the pool...
     Value *AI = new AllocaInst(PoolDescType, 0, "PD", InsertPoint);
-    const Type *Eltype;
-    Value *ElSize;
-    
+
     // Void types in DS graph are never used
-    if (Node->getType() != Type::VoidTy) {
-      ElSize = ConstantUInt::get(Type::UIntTy, TD.getTypeSize(Node->getType()));
-      Eltype = Node->getType();
-    } else {
+    if (Node->getType() == Type::VoidTy)
       std::cerr << "Node collapsing in '" << F.getName() 
 		<< "'. All Data Structures may not be pool allocated\n";
-      ElSize = ConstantUInt::get(Type::UIntTy, 1);
-    }
     
-    // Insert the call to initialize the pool...
-    new CallInst(PoolInit, make_vector(AI, ElSize, 0), "", InsertPoint);
     ++NumPools;
       
     // Update the PoolDescriptors map
     PoolDescriptors.insert(std::make_pair(Node, AI));
-    PoolDescTypeMap[AI] = Eltype;
-    
-    // Insert a call to pool destroy before each return inst in the function
-    for (unsigned r = 0, e = ReturnNodes.size(); r != e; ++r)
-      new CallInst(PoolDestroy, make_vector(AI, 0), "",
-		   ReturnNodes[r]->getTerminator());
+    PoolDescTypeMap[AI] = Node->getType();
   }
 }
 
@@ -561,17 +540,64 @@
       NodesToPA.push_back(Nodes[i]);
   
   DEBUG(std::cerr << NodesToPA.size() << " nodes to pool allocate\n");
-  if (!NodesToPA.empty()) {
-    // Create pool construction/destruction code
-    std::map &PoolDescriptors = FI.PoolDescriptors;
-    std::map &PoolDescTypeMap = FI.PoolDescType;
-    CreatePools(NewF, NodesToPA, PoolDescriptors, PoolDescTypeMap);
-  }
+  if (!NodesToPA.empty())    // Insert pool alloca's
+    CreatePools(NewF, NodesToPA, FI.PoolDescriptors, FI.PoolDescType);
   
   // Transform the body of the function now... collecting information about uses
   // of the pools.
   std::set > PoolUses;
   std::set > PoolFrees;
   TransformBody(G, TDDS->getDSGraph(F), FI, PoolUses, PoolFrees, NewF);
+
+  // Create pool construction/destruction code
+  if (!NodesToPA.empty())
+    InitializeAndDestroyPools(NewF, NodesToPA,
+                              FI.PoolDescriptors, FI.PoolDescType);
 }
 
+/// InitializeAndDestroyPools - This inserts calls to poolinit and pooldestroy
+/// into the function to initialize and destroy the pools in the NodesToPA list.
+///
+void PoolAllocate::InitializeAndDestroyPools(Function &F,
+                               const std::vector &NodesToPA,
+                               std::map &PoolDescriptors,
+			       std::map &PoolDescTypeMap) {
+
+  TargetData &TD = getAnalysis();
+  
+  // Insert poolinit calls after all of the allocas...
+  Instruction *InsertPoint;
+  for (BasicBlock::iterator I = F.front().begin();
+       isa(InsertPoint = I); ++I)
+    /*empty*/;
+
+
+  // Insert all of the poolalloc calls in the start of the function.
+  for (unsigned i = 0, e = NodesToPA.size(); i != e; ++i) {
+    DSNode *Node = NodesToPA[i];
+    
+    // Create a new alloca instruction for the pool...
+    Value *PD = PoolDescriptors[Node];
+    Value *ElSize;
+    
+    // Void types in DS graph are never used
+    if (Node->getType() != Type::VoidTy) {
+      ElSize = ConstantUInt::get(Type::UIntTy, TD.getTypeSize(Node->getType()));
+    } else {
+      ElSize = ConstantUInt::get(Type::UIntTy, 1);
+    }
+    
+    // Insert the call to initialize the pool...
+    new CallInst(PoolInit, make_vector(PD, ElSize, 0), "", InsertPoint);
+  }
+
+  // Loop over all of the return nodes in the CFG...
+  for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
+    if (isa(BB->getTerminator()))
+      for (unsigned i = 0, e = NodesToPA.size(); i != e; ++i)
+        // Insert the pooldestroy call for this pool.
+        new CallInst(PoolDestroy, make_vector(PoolDescriptors[NodesToPA[i]], 0),
+                     "", BB->getTerminator());
+
+}




From lattner at cs.uiuc.edu  Sun Nov  9 19:26:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 19:26:01 2003
Subject: [llvm-commits] CVS: poolalloc/include/poolalloc/PoolAllocate.h
Message-ID: <200311100125.TAA25100@zion.cs.uiuc.edu>


Changes in directory poolalloc/include/poolalloc:

PoolAllocate.h updated: 1.12 -> 1.13

---
Log message:

Eliminate the PoolDescTypeMap


---
Diffs of the changes:  (+2 -9)

Index: poolalloc/include/poolalloc/PoolAllocate.h
diff -u poolalloc/include/poolalloc/PoolAllocate.h:1.12 poolalloc/include/poolalloc/PoolAllocate.h:1.13
--- poolalloc/include/poolalloc/PoolAllocate.h:1.12	Sun Nov  9 18:12:53 2003
+++ poolalloc/include/poolalloc/PoolAllocate.h	Sun Nov  9 19:25:38 2003
@@ -63,10 +63,6 @@
     /// indirect function calls that are not used in the function.
     std::map PoolDescriptors;
 
-    // Dinakar :  Added  map from alloca of poolinit or argument to the
-    // corresponding type, the type of Value * is that of pooldescriptor
-    std::map PoolDescType;
-  
     /// NewToOldValueMap - When and if a function needs to be cloned, this map
     /// contains a mapping from all of the values in the new function back to
     /// the values they correspond to in the old function.
@@ -174,8 +170,7 @@
   /// PoolDescriptors map for each DSNode.
   ///
   void CreatePools(Function &F, const std::vector &NodesToPA,
-                   std::map &PoolDescriptors,
-		   std::map &PoolDescTypeMap);
+                   std::map &PoolDescriptors);
   
   void InlineIndirectCalls(Function &F, DSGraph &G, 
 			   hash_set &visited);
@@ -190,9 +185,7 @@
   /// list.
   void InitializeAndDestroyPools(Function &F,
                                  const std::vector &NodesToPA,
-                                 std::map &PoolDescriptors,
-                                 std::map &PoolDescTypeMap);
+                                 std::map &PoolDescriptors);
 };
 
 #endif




From lattner at cs.uiuc.edu  Sun Nov  9 19:26:11 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 19:26:11 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp TransformFunctionBody.cpp
Message-ID: <200311100125.TAA25091@zion.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.36 -> 1.37
TransformFunctionBody.cpp updated: 1.4 -> 1.5

---
Log message:

Eliminate the PoolDescTypeMap, as it is not used anywhere and it is not always initialized


---
Diffs of the changes:  (+7 -34)

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.36 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.37
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.36	Sun Nov  9 18:13:55 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Sun Nov  9 19:25:28 2003
@@ -414,8 +414,6 @@
   // Set the rest of the new arguments names to be PDa and add entries to the
   // pool descriptors map
   std::map &PoolDescriptors = FI.PoolDescriptors;
-  //Dinakar set the type of pooldesctriptors
-  std::map &PoolDescTypeMap = FI.PoolDescType;
   Function::aiterator NI = New->abegin();
   
   if (FuncECs.findClass(&F)) {
@@ -429,11 +427,9 @@
       for (int i = 0; i < FI.PoolArgFirst; ++NI, ++i)
 	;
 
-    for (unsigned i = 0, e = FI.ArgNodes.size(); i != e; ++i, ++NI) {
-      PoolDescTypeMap[NI] = FI.ArgNodes[i]->getType();
-      
+    for (unsigned i = 0, e = FI.ArgNodes.size(); i != e; ++i, ++NI)
       PoolDescriptors.insert(std::make_pair(FI.ArgNodes[i], NI));
-    }
+
     NI = New->abegin();
     if (EqClass2LastPoolArg.count(FuncECs.findClass(&F)))
       for (int i = 0; i <= EqClass2LastPoolArg[FuncECs.findClass(&F)]; ++i,++NI)
@@ -443,7 +439,6 @@
     if (FI.ArgNodes.size())
       for (unsigned i = 0, e = FI.ArgNodes.size(); i != e; ++i, ++NI) {
 	NI->setName("PDa");  // Add pd entry
-	PoolDescTypeMap[NI] = FI.ArgNodes[i]->getType();
 	PoolDescriptors.insert(std::make_pair(FI.ArgNodes[i], NI));
       }
     NI = New->abegin();
@@ -487,9 +482,7 @@
 //
 void PoolAllocate::CreatePools(Function &F,
                                const std::vector &NodesToPA,
-                               std::map &PoolDescriptors,
-			       std::map &PoolDescTypeMap) {
+                               std::map &PoolDescriptors) {
 
   // Loop over all of the pools, inserting code into the entry block of the
   // function for the initialization and code in the exit blocks for
@@ -511,7 +504,6 @@
       
     // Update the PoolDescriptors map
     PoolDescriptors.insert(std::make_pair(Node, AI));
-    PoolDescTypeMap[AI] = Node->getType();
   }
 }
 
@@ -541,7 +533,7 @@
   
   DEBUG(std::cerr << NodesToPA.size() << " nodes to pool allocate\n");
   if (!NodesToPA.empty())    // Insert pool alloca's
-    CreatePools(NewF, NodesToPA, FI.PoolDescriptors, FI.PoolDescType);
+    CreatePools(NewF, NodesToPA, FI.PoolDescriptors);
   
   // Transform the body of the function now... collecting information about uses
   // of the pools.
@@ -551,8 +543,7 @@
 
   // Create pool construction/destruction code
   if (!NodesToPA.empty())
-    InitializeAndDestroyPools(NewF, NodesToPA,
-                              FI.PoolDescriptors, FI.PoolDescType);
+    InitializeAndDestroyPools(NewF, NodesToPA, FI.PoolDescriptors);
 }
 
 /// InitializeAndDestroyPools - This inserts calls to poolinit and pooldestroy
@@ -560,10 +551,7 @@
 ///
 void PoolAllocate::InitializeAndDestroyPools(Function &F,
                                const std::vector &NodesToPA,
-                               std::map &PoolDescriptors,
-			       std::map &PoolDescTypeMap) {
-
+                                 std::map &PoolDescriptors) {
   TargetData &TD = getAnalysis();
   
   // Insert poolinit calls after all of the allocas...


Index: poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp
diff -u poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.4 poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.5
--- poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp:1.4	Sun Nov  9 18:13:04 2003
+++ poolalloc/lib/PoolAllocate/TransformFunctionBody.cpp	Sun Nov  9 19:25:28 2003
@@ -306,14 +306,8 @@
   Value *V = new CallInst(PAInfo.PoolAlloc, make_vector(PH, AllocSize, 0),
                           Name, &MI);
 
-  const Type *phtype = MI.getType()->getElementType();
-  std::map &PoolDescType = FI.PoolDescType;
-  if (!PoolDescType.count(PH))
-    PoolDescType[PH] = phtype;
-
-  Value *Casted = V;
-
   // Cast to the appropriate type if necessary
+  Value *Casted = V;
   if (V->getType() != MI.getType())
     Casted = new CastInst(V, MI.getType(), V->getName(), &MI);
     
@@ -349,15 +343,6 @@
   Value *PH = getPoolHandle(Arg);  // Get the pool handle for this DSNode...
   if (PH == 0) return;
 
-  const Type *phtype = 0;
-  if (const PointerType *ptype = dyn_cast(Arg->getType()))
-    phtype = ptype->getElementType();
-
-  assert((phtype != 0) && "Needs to be implemented \n ");
-  std::map &PoolDescType = FI.PoolDescType;
-  if (!PoolDescType.count(PH))
-    PoolDescType[PH] = phtype;
-  
   // Insert a cast and a call to poolfree...
   Value *Casted = Arg;
   if (Arg->getType() != PointerType::get(Type::SByteTy))




From gaeke at cs.uiuc.edu  Sun Nov  9 21:06:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 21:06:01 2003
Subject: [llvm-commits] CVS: llvm/CREDITS.TXT
Message-ID: <200311100305.VAA04218@zion.cs.uiuc.edu>


Changes in directory llvm:

CREDITS.TXT updated: 1.5 -> 1.6

---
Log message:

add Reid Spencer


---
Diffs of the changes:  (+5 -0)

Index: llvm/CREDITS.TXT
diff -u llvm/CREDITS.TXT:1.5 llvm/CREDITS.TXT:1.6
--- llvm/CREDITS.TXT:1.5	Sun Oct 19 22:59:05 2003
+++ llvm/CREDITS.TXT	Sun Nov  9 21:05:36 2003
@@ -53,6 +53,11 @@
 E: ashukla at cs.uiuc.edu
 D: The `paths' pass
 
+N: Reid Spencer
+E: rspencer at x10sys.com
+W: http://extprosys.sourceforge.net/
+D: Sundry tasks for basing XPL on LLVM.
+
 N: Bill Wendling
 E: wendling at isanbard.org
 D: The `Lower Setjmp/Longjmp' pass, improvements to the -lowerswitch pass.




From gaeke at cs.uiuc.edu  Sun Nov  9 21:07:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 21:07:01 2003
Subject: [llvm-commits] CVS: llvm/include/Config/config.h.in
Message-ID: <200311100306.VAA04267@zion.cs.uiuc.edu>


Changes in directory llvm/include/Config:

config.h.in updated: 1.5 -> 1.6

---
Log message:

Regenerated.


---
Diffs of the changes:  (+19 -7)

Index: llvm/include/Config/config.h.in
diff -u llvm/include/Config/config.h.in:1.5 llvm/include/Config/config.h.in:1.6
--- llvm/include/Config/config.h.in:1.5	Mon Oct 13 11:22:01 2003
+++ llvm/include/Config/config.h.in	Sun Nov  9 21:06:28 2003
@@ -54,10 +54,20 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* define if the compiler has ext/hash_map */
+/* Define if the compiler has a header  that defines template class
+   ::hash_map. */
+#undef HAVE_GLOBAL_HASH_MAP
+
+/* Define if the compiler has a header  that defines template class
+   ::hash_set. */
+#undef HAVE_GLOBAL_HASH_SET
+
+/* Define if the compiler has a header  that defines template
+   class __gnu_cxx::hash_map. */
 #undef HAVE_GNU_EXT_HASH_MAP
 
-/* define if the compiler has ext/hash_set in __gnu_cc */
+/* Define if the compiler has a header  that defines template
+   class __gnu_cxx::hash_set. */
 #undef HAVE_GNU_EXT_HASH_SET
 
 /* Define to 1 if the system has the type `int64_t'. */
@@ -100,6 +110,9 @@
 /* define if the compiler implements namespaces */
 #undef HAVE_NAMESPACES
 
+/* Define to have the %a format string */
+#undef HAVE_PRINTF_A
+
 /* Define to 1 if you have the  header file. */
 #undef HAVE_SIGNAL_H
 
@@ -109,10 +122,12 @@
 /* Define to 1 if you have the  header file. */
 #undef HAVE_STDLIB_H
 
-/* define if the compiler has ext/hash_map */
+/* Define if the compiler has a header  that defines template
+   class std::hash_map. */
 #undef HAVE_STD_EXT_HASH_MAP
 
-/* define if the compiler has ext/hash_set in std */
+/* Define if the compiler has a header  that defines template
+   class std::hash_set. */
 #undef HAVE_STD_EXT_HASH_SET
 
 /* define if the compiler has STL iterators */
@@ -226,6 +241,3 @@
 
 /* Define to `unsigned' if  does not define. */
 #undef size_t
-
-/* Define to have the %a format string in printf() */
-#undef HAVE_PRINTF_A




From gaeke at cs.uiuc.edu  Sun Nov  9 21:07:11 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 21:07:11 2003
Subject: [llvm-commits] CVS: llvm/configure
Message-ID: <200311100306.VAA04260@zion.cs.uiuc.edu>


Changes in directory llvm:

configure updated: 1.50 -> 1.51

---
Log message:

Regenerated.


---
Diffs of the changes:  (+210 -36)

Index: llvm/configure
diff -u llvm/configure:1.50 llvm/configure:1.51
--- llvm/configure:1.50	Tue Oct 28 13:21:11 2003
+++ llvm/configure	Sun Nov  9 21:06:27 2003
@@ -20846,9 +20846,9 @@
 
 fi
 
-echo "$as_me:$LINENO: checking whether the compiler has ext/hash_map" >&5
-echo $ECHO_N "checking whether the compiler has ext/hash_map... $ECHO_C" >&6
-if test "${ac_cv_cxx_have_ext_hash_map+set}" = set; then
+echo "$as_me:$LINENO: checking whether the compiler has  defining template class std::hash_map" >&5
+echo $ECHO_N "checking whether the compiler has  defining template class std::hash_map... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_std_ext_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -20874,7 +20874,7 @@
 int
 main ()
 {
-hash_map t; return 0;
+hash_map t;
   ;
   return 0;
 }
@@ -20891,14 +20891,44 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_map=std
+  ac_cv_cxx_have_std_ext_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_cxx_have_ext_hash_map=no
+ac_cv_cxx_have_std_ext_hash_map=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_std_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_std_ext_hash_map" >&6
+ if test "$ac_cv_cxx_have_std_ext_hash_map" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_EXT_HASH_MAP
+_ACEOF
+
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has  defining template class __gnu_cxx::hash_map" >&5
+echo $ECHO_N "checking whether the compiler has  defining template class __gnu_cxx::hash_map... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_gnu_ext_hash_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -20913,7 +20943,7 @@
 int
 main ()
 {
-hash_map t; return 0;
+hash_map t;
   ;
   return 0;
 }
@@ -20930,12 +20960,12 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_map=gnu
+  ac_cv_cxx_have_gnu_ext_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_cxx_have_ext_hash_map=no
+ac_cv_cxx_have_gnu_ext_hash_map=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
@@ -20944,28 +20974,85 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6
-if test "$ac_cv_cxx_have_ext_hash_map" = std; then
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_gnu_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_gnu_ext_hash_map" >&6
+ if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_EXT_HASH_MAP
+#define HAVE_GNU_EXT_HASH_MAP
 _ACEOF
 
-fi
-if test "$ac_cv_cxx_have_ext_hash_map" = gnu; then
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has  defining template class ::hash_map" >&5
+echo $ECHO_N "checking whether the compiler has  defining template class ::hash_map... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_global_hash_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_EXT_HASH_MAP
+
+
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include 
+int
+main ()
+{
+hash_map t;
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_cxx_have_global_hash_map=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_cxx_have_global_hash_map=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_global_hash_map" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_global_hash_map" >&6
+ if test "$ac_cv_cxx_have_global_hash_map" = yes; then
 
-echo "$as_me:$LINENO: checking whether the compiler has ext/hash_set" >&5
-echo $ECHO_N "checking whether the compiler has ext/hash_set... $ECHO_C" >&6
-if test "${ac_cv_cxx_have_ext_hash_set+set}" = set; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GLOBAL_HASH_MAP
+_ACEOF
+
+ fi
+echo "$as_me:$LINENO: checking whether the compiler has  defining template class std::hash_set" >&5
+echo $ECHO_N "checking whether the compiler has  defining template class std::hash_set... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_std_ext_hash_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -20991,7 +21078,7 @@
 int
 main ()
 {
-hash_set t; return 0;
+hash_set t;
   ;
   return 0;
 }
@@ -21008,14 +21095,44 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_set=std
+  ac_cv_cxx_have_std_ext_hash_set=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_cxx_have_ext_hash_set=no
+ac_cv_cxx_have_std_ext_hash_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_std_ext_hash_set" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_std_ext_hash_set" >&6
+ if test "$ac_cv_cxx_have_std_ext_hash_set" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_EXT_HASH_SET
+_ACEOF
+
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has  defining template class __gnu_cxx::hash_set" >&5
+echo $ECHO_N "checking whether the compiler has  defining template class __gnu_cxx::hash_set... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_gnu_ext_hash_set+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -21030,7 +21147,7 @@
 int
 main ()
 {
-hash_set t; return 0;
+hash_set t;
   ;
   return 0;
 }
@@ -21047,12 +21164,12 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_set=gnu
+  ac_cv_cxx_have_gnu_ext_hash_set=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_cxx_have_ext_hash_set=no
+ac_cv_cxx_have_gnu_ext_hash_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
@@ -21061,25 +21178,82 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_set" >&5
-echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_set" >&6
-if test "$ac_cv_cxx_have_ext_hash_set" = std; then
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_gnu_ext_hash_set" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_gnu_ext_hash_set" >&6
+ if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_EXT_HASH_SET
+#define HAVE_GNU_EXT_HASH_SET
 _ACEOF
 
-fi
-if test "$ac_cv_cxx_have_ext_hash_set" = gnu; then
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has  defining template class ::hash_set" >&5
+echo $ECHO_N "checking whether the compiler has  defining template class ::hash_set... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_global_hash_set+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_EXT_HASH_SET
+
+
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include 
+int
+main ()
+{
+hash_set t; return 0;
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_cxx_have_global_hash_set=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_cxx_have_global_hash_set=no
 fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_global_hash_set" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_global_hash_set" >&6
+ if test "$ac_cv_cxx_have_global_hash_set" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GLOBAL_HASH_SET
+_ACEOF
 
+ fi
 echo "$as_me:$LINENO: checking whether the compiler has ext/slist" >&5
 echo $ECHO_N "checking whether the compiler has ext/slist... $ECHO_C" >&6
 if test "${ac_cv_cxx_have_ext_slist+set}" = set; then




From gaeke at cs.uiuc.edu  Sun Nov  9 21:07:21 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 21:07:21 2003
Subject: [llvm-commits] CVS: llvm/include/Support/hash_map hash_set
Message-ID: <200311100306.VAA04248@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

hash_map updated: 1.13 -> 1.14
hash_set updated: 1.12 -> 1.13

---
Log message:

Patch to fix PR102, contributed by Reid Spencer.


---
Diffs of the changes:  (+43 -29)

Index: llvm/include/Support/hash_map
diff -u llvm/include/Support/hash_map:1.13 llvm/include/Support/hash_map:1.14
--- llvm/include/Support/hash_map:1.13	Mon Oct 20 14:46:57 2003
+++ llvm/include/Support/hash_map	Sun Nov  9 21:06:09 2003
@@ -29,23 +29,30 @@
 
 #ifdef HAVE_GNU_EXT_HASH_MAP
 // This is for GCC-3.1+ which puts hash in ext/hash_map
-#include 
-#define HASH_NAMESPACE __gnu_cxx
+# include 
+# ifndef HASH_NAMESPACE
+#  define HASH_NAMESPACE __gnu_cxx
+# endif
 
-#else
+// GCC 3.0.x puts hash_map in  and in the std namespace.
+#elif defined(HAVE_STD_EXT_HASH_MAP)
+# include 
+# ifndef HASH_NAMESPACE
+#  define HASH_NAMESPACE std
+# endif
 
-// This is for GCC-3.0.x which puts hashmap in the `ext' directory.
-#ifdef HAVE_STD_EXT_HASH_MAP
-#include 
-#define HASH_NAMESPACE std
+// Older compilers such as GCC before version 3.0 do not keep
+// extensions in the `ext' directory, and ignore the `std' namespace.
+#elif defined(HAVE_GLOBAL_HASH_MAP)
+# include 
+# ifndef HASH_NAMESPACE
+#  define HASH_NAMESPACE std
+# endif
 
+// Give a warning if we couldn't find it, instead of (or in addition to)
+// randomly doing something dumb.
 #else
-// This handles older, pre-3.0 GCC which do not have the extentions in the `ext'
-// directory, and ignore the `std' namespace.
-#include 
-#define HASH_NAMESPACE std
-#endif
-
+# warning "Autoconfiguration failed to find the hash_map header file."
 #endif
 
 using HASH_NAMESPACE::hash_map;


Index: llvm/include/Support/hash_set
diff -u llvm/include/Support/hash_set:1.12 llvm/include/Support/hash_set:1.13
--- llvm/include/Support/hash_set:1.12	Mon Oct 20 14:46:57 2003
+++ llvm/include/Support/hash_set	Sun Nov  9 21:06:09 2003
@@ -28,26 +28,33 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_GNU_EXT_HASH_SET
+// GCC versions 3.1 and later put hash_set in  and in
+// the __gnu_cxx namespace.
+#if defined(HAVE_GNU_EXT_HASH_SET)
+# include 
+# ifndef HASH_NAMESPACE
+#  define HASH_NAMESPACE __gnu_cxx
+# endif
 
-// This is for GCC-3.1+ which puts hashset in ext/hash_set
-#include 
-#define HASH_NAMESPACE __gnu_cxx
+// GCC 3.0.x puts hash_set in  and in the std namespace.
+#elif defined(HAVE_STD_EXT_HASH_SET)
+# include 
+# ifndef HASH_NAMESPACE
+#  define HASH_NAMESPACE std
+# endif
 
-#else
-
-// This is for GCC-3.0.x which puts hashmap in the `ext' directory.
-#ifdef HAVE_STD_EXT_HASH_SET
-#include 
-#define HASH_NAMESPACE std
+// Older compilers such as GCC before version 3.0 do not keep
+// extensions in the `ext' directory, and ignore the `std' namespace.
+#elif defined(HAVE_GLOBAL_HASH_SET)
+# include 
+# ifndef HASH_NAMESPACE
+#  define HASH_NAMESPACE std
+# endif
 
+// Give a warning if we couldn't find it, instead of (or in addition to)
+// randomly doing something dumb.
 #else
-// This handles older, pre-3.0 GCC which do not have the extentions in the `ext'
-// directory, and ignore the `std' namespace.
-#include 
-#define HASH_NAMESPACE std
-#endif
-
+# warning "Autoconfiguration failed to find the hash_set header file."
 #endif
 
 using HASH_NAMESPACE::hash_set;




From gaeke at cs.uiuc.edu  Sun Nov  9 21:07:31 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sun Nov  9 21:07:31 2003
Subject: [llvm-commits] CVS: llvm/autoconf/aclocal.m4 configure.ac
Message-ID: <200311100306.VAA04237@zion.cs.uiuc.edu>


Changes in directory llvm/autoconf:

aclocal.m4 updated: 1.7 -> 1.8
configure.ac updated: 1.46 -> 1.47

---
Log message:

Patch to fix PR102, contributed by Reid Spencer.


---
Diffs of the changes:  (+86 -37)

Index: llvm/autoconf/aclocal.m4
diff -u llvm/autoconf/aclocal.m4:1.7 llvm/autoconf/aclocal.m4:1.8
--- llvm/autoconf/aclocal.m4:1.7	Mon Oct 13 11:22:00 2003
+++ llvm/autoconf/aclocal.m4	Sun Nov  9 21:06:07 2003
@@ -5892,61 +5892,109 @@
 # Check for hash_map extension.  This is from
 # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_map.html
 #
-AC_DEFUN([AC_CXX_HAVE_EXT_HASH_MAP],
-[AC_CACHE_CHECK(whether the compiler has ext/hash_map,
-ac_cv_cxx_have_ext_hash_map,
-[AC_REQUIRE([AC_CXX_NAMESPACES])
+AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_MAP],
+[AC_CACHE_CHECK([whether the compiler has  defining template class std::hash_map],
+ ac_cv_cxx_have_std_ext_hash_map,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   AC_TRY_COMPILE([#include 
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[hash_map t; return 0;],
-  ac_cv_cxx_have_ext_hash_map=std, ac_cv_cxx_have_ext_hash_map=no)
+#endif],[hash_map t;],
+  [ac_cv_cxx_have_std_ext_hash_map=yes], [ac_cv_cxx_have_std_ext_hash_map=no])
+  AC_LANG_RESTORE])
+ if test "$ac_cv_cxx_have_std_ext_hash_map" = yes; then
+   AC_DEFINE(HAVE_STD_EXT_HASH_MAP,,[Define if the compiler has a header  that defines template class std::hash_map.])
+ fi])
+
+AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_MAP],
+[AC_CACHE_CHECK([whether the compiler has  defining template class __gnu_cxx::hash_map],
+ ac_cv_cxx_have_gnu_ext_hash_map,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
   AC_TRY_COMPILE([#include 
 #ifdef HAVE_NAMESPACES
 using namespace __gnu_cxx;
-#endif],[hash_map t; return 0;],
-  ac_cv_cxx_have_ext_hash_map=gnu, ac_cv_cxx_have_ext_hash_map=no)
-  AC_LANG_RESTORE
-])
-if test "$ac_cv_cxx_have_ext_hash_map" = std; then
-   AC_DEFINE(HAVE_STD_EXT_HASH_MAP,,[define if the compiler has ext/hash_map])
-fi
-if test "$ac_cv_cxx_have_ext_hash_map" = gnu; then
-   AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,,[define if the compiler has ext/hash_map])
-fi
-])
-
+#endif],[hash_map t; ],
+  [ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no])
+  AC_LANG_RESTORE])
+ if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes; then
+   AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,,[Define if the compiler has a header  that defines template class __gnu_cxx::hash_map.])
+ fi])
+
+AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_MAP],
+[AC_CACHE_CHECK([whether the compiler has  defining template class ::hash_map],
+ ac_cv_cxx_have_global_hash_map,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([#include ],[hash_map t; ],
+  [ac_cv_cxx_have_global_hash_map=yes], [ac_cv_cxx_have_global_hash_map=no])
+  AC_LANG_RESTORE])
+ if test "$ac_cv_cxx_have_global_hash_map" = yes; then
+   AC_DEFINE(HAVE_GLOBAL_HASH_MAP,,[Define if the compiler has a header  that defines template class ::hash_map.])
+ fi])
+
+AC_DEFUN([AC_CXX_HAVE_HASH_MAP],
+[AC_CXX_HAVE_STD_EXT_HASH_MAP
+ AC_CXX_HAVE_GNU_EXT_HASH_MAP
+ AC_CXX_HAVE_GLOBAL_HASH_MAP])
 #
 # Check for hash_set extension.  This is modified from
 # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
 #
-AC_DEFUN([AC_CXX_HAVE_EXT_HASH_SET],
-[AC_CACHE_CHECK(whether the compiler has ext/hash_set,
-ac_cv_cxx_have_ext_hash_set,
-[AC_REQUIRE([AC_CXX_NAMESPACES])
+AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_SET],
+[AC_CACHE_CHECK([whether the compiler has  defining template class std::hash_set],
+ ac_cv_cxx_have_std_ext_hash_set,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   AC_TRY_COMPILE([#include 
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[hash_set t; return 0;],
-  ac_cv_cxx_have_ext_hash_set=std, ac_cv_cxx_have_ext_hash_set=no)
+#endif],[hash_set t; ],
+  [ac_cv_cxx_have_std_ext_hash_set=yes], [ac_cv_cxx_have_std_ext_hash_set=no])
+  AC_LANG_RESTORE])
+ if test "$ac_cv_cxx_have_std_ext_hash_set" = yes; then
+   AC_DEFINE(HAVE_STD_EXT_HASH_SET,,[Define if the compiler has a header  that defines template class std::hash_set.])
+ fi])
+
+AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET],
+[AC_CACHE_CHECK(
+ [whether the compiler has  defining template class __gnu_cxx::hash_set],
+ ac_cv_cxx_have_gnu_ext_hash_set,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
   AC_TRY_COMPILE([#include 
 #ifdef HAVE_NAMESPACES
 using namespace __gnu_cxx;
-#endif],[hash_set t; return 0;],
-  ac_cv_cxx_have_ext_hash_set=gnu, ac_cv_cxx_have_ext_hash_set=no)
-  AC_LANG_RESTORE
-])
-if test "$ac_cv_cxx_have_ext_hash_set" = std; then
-   AC_DEFINE(HAVE_STD_EXT_HASH_SET,,[define if the compiler has ext/hash_set in std])
-fi
-if test "$ac_cv_cxx_have_ext_hash_set" = gnu; then
-   AC_DEFINE(HAVE_GNU_EXT_HASH_SET,,[define if the compiler has ext/hash_set in __gnu_cc])
-fi
-])
+#endif],[hash_set t; ],
+  [ac_cv_cxx_have_gnu_ext_hash_set=yes], [ac_cv_cxx_have_gnu_ext_hash_set=no])
+  AC_LANG_RESTORE])
+ if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes; then
+   AC_DEFINE(HAVE_GNU_EXT_HASH_SET,,[Define if the compiler has a header  that defines template class __gnu_cxx::hash_set.])
+ fi])
+
+AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET],
+[AC_CACHE_CHECK([whether the compiler has  defining template class ::hash_set],
+ ac_cv_cxx_have_global_hash_set,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([#include ],[hash_set t; return 0;],
+  [ac_cv_cxx_have_global_hash_set=yes], [ac_cv_cxx_have_global_hash_set=no])
+  AC_LANG_RESTORE])
+ if test "$ac_cv_cxx_have_global_hash_set" = yes; then
+   AC_DEFINE(HAVE_GLOBAL_HASH_SET,,[Define if the compiler has a header  that defines template class ::hash_set.])
+ fi])
+
+AC_DEFUN([AC_CXX_HAVE_HASH_SET],
+[AC_CXX_HAVE_STD_EXT_HASH_SET
+ AC_CXX_HAVE_GNU_EXT_HASH_SET
+ AC_CXX_HAVE_GLOBAL_HASH_SET])
 
 #
 # Check for standard iterator extension.  This is modified from
@@ -6195,4 +6243,5 @@
 		AC_DEFINE([HAVE_PRINTF_A],[1],[Define to have the %a format string])
 	fi
 ])
+
 


Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.46 llvm/autoconf/configure.ac:1.47
--- llvm/autoconf/configure.ac:1.46	Tue Oct 28 13:17:11 2003
+++ llvm/autoconf/configure.ac	Sun Nov  9 21:06:07 2003
@@ -460,8 +460,8 @@
 AC_C_PRINTF_A
 
 dnl Check for C++ extensions
-AC_CXX_HAVE_EXT_HASH_MAP
-AC_CXX_HAVE_EXT_HASH_SET
+AC_CXX_HAVE_HASH_MAP
+AC_CXX_HAVE_HASH_SET
 AC_CXX_HAVE_EXT_SLIST
 AC_CXX_HAVE_STD_ITERATOR
 AC_CXX_HAVE_BI_ITERATOR




From lattner at cs.uiuc.edu  Sun Nov  9 22:11:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:11:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
Message-ID: <200311100410.WAA12763@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

CorrelatedExprs.cpp updated: 1.17 -> 1.18

---
Log message:

Adjust to new critical edge interface


---
Diffs of the changes:  (+4 -6)

Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.17 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.18
--- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.17	Mon Oct 20 14:43:19 2003
+++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp	Sun Nov  9 22:10:45 2003
@@ -29,13 +29,12 @@
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Pass.h"
 #include "llvm/Function.h"
-#include "llvm/iTerminators.h"
-#include "llvm/iPHINode.h"
-#include "llvm/iOperators.h"
+#include "llvm/Instructions.h"
 #include "llvm/ConstantHandling.h"
-#include "llvm/Assembly/Writer.h"
 #include "llvm/Analysis/Dominators.h"
+#include "llvm/Assembly/Writer.h"
 #include "llvm/Transforms/Utils/Local.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Support/ConstantRange.h"
 #include "llvm/Support/CFG.h"
 #include "Support/Debug.h"
@@ -605,8 +604,7 @@
 
   // If we just introduced a critical edge in the flow graph, make sure to break
   // it right away...
-  if (isCriticalEdge(TI, SuccNo))
-    SplitCriticalEdge(TI, SuccNo, this);
+  SplitCriticalEdge(TI, SuccNo, this);
 
   // Make sure that we don't introduce critical edges from oldsucc now!
   for (unsigned i = 0, e = OldSucc->getTerminator()->getNumSuccessors();




From lattner at cs.uiuc.edu  Sun Nov  9 22:11:11 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:11:11 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Scalar.h
Message-ID: <200311100410.WAA12756@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms:

Scalar.h updated: 1.29 -> 1.30

---
Log message:

Move isCriticalEdge & SplitCritical edge out of this file, which is only
for passes.


---
Diffs of the changes:  (+1 -17)

Index: llvm/include/llvm/Transforms/Scalar.h
diff -u llvm/include/llvm/Transforms/Scalar.h:1.29 llvm/include/llvm/Transforms/Scalar.h:1.30
--- llvm/include/llvm/Transforms/Scalar.h:1.29	Fri Nov  7 11:19:39 2003
+++ llvm/include/llvm/Transforms/Scalar.h	Sun Nov  9 22:09:44 2003
@@ -216,26 +216,10 @@
 //   AU.addRequiredID(BreakCriticalEdgesID);
 //
 // This pass obviously invalidates the CFG, but can update forward dominator
-// (set, immediate dominators, and tree) information.
+// (set, immediate dominators, tree, and frontier) information.
 //
 Pass *createBreakCriticalEdgesPass();
 extern const PassInfo *BreakCriticalEdgesID;
-
-// The BreakCriticalEdges pass also exposes some low-level functionality that
-// may be used by other passes.
-
-/// isCriticalEdge - Return true if the specified edge is a critical edge.
-/// Critical edges are edges from a block with multiple successors to a block
-/// with multiple predecessors.
-///
-bool isCriticalEdge(const TerminatorInst *TI, unsigned SuccNum);
-
-/// SplitCriticalEdge - Insert a new node node to split the critical edge.  This
-/// will update DominatorSet, ImmediateDominator and DominatorTree information
-/// if a pass is specified, thus calling this pass will not invalidate these
-/// analyses.
-///
-void SplitCriticalEdge(TerminatorInst *TI, unsigned SuccNum, Pass *P = 0);
 
 //===----------------------------------------------------------------------===//
 //




From lattner at cs.uiuc.edu  Sun Nov  9 22:11:21 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:11:21 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
Message-ID: <200311100410.WAA12737@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms/Utils:

BasicBlockUtils.h updated: 1.5 -> 1.6

---
Log message:

Move isCriticalEdge & SplitCritical into this file.  While we're at it, change
the interface to SplitCriticalEdge so that it splits an edge if it is critical, 
otherwise just returns false and noops if not.


---
Diffs of the changes:  (+16 -0)

Index: llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
diff -u llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h:1.5 llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h:1.6
--- llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h:1.5	Mon Oct 20 15:19:47 2003
+++ llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h	Sun Nov  9 22:10:27 2003
@@ -19,6 +19,7 @@
 
 #include "llvm/BasicBlock.h"
 class Instruction;
+class Pass;
 
 // ReplaceInstWithValue - Replace all uses of an instruction (specified by BI)
 // with a value, then remove and delete the original instruction.
@@ -47,5 +48,20 @@
 // suprising change in program behavior if it is not expected.
 //
 void RemoveSuccessor(TerminatorInst *TI, unsigned SuccNum);
+
+
+/// isCriticalEdge - Return true if the specified edge is a critical edge.
+/// Critical edges are edges from a block with multiple successors to a block
+/// with multiple predecessors.
+///
+bool isCriticalEdge(const TerminatorInst *TI, unsigned SuccNum);
+
+/// SplitCriticalEdge - If this edge is a critical edge, insert a new node to
+/// split the critical edge.  This will update DominatorSet, ImmediateDominator,
+/// DominatorTree, and DominatorFrontier information if it is available, thus
+/// calling this pass will not invalidate either of them.  This returns true if
+/// the edge was split, false otherwise.
+///
+bool SplitCriticalEdge(TerminatorInst *TI, unsigned SuccNum, Pass *P = 0);
 
 #endif




From lattner at cs.uiuc.edu  Sun Nov  9 22:12:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:12:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
Message-ID: <200311100411.WAA12771@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.12 -> 1.13

---
Log message:

Adjust to new critical edge interface



---
Diffs of the changes:  (+11 -9)

Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.12 llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.13
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.12	Mon Oct 20 14:43:20 2003
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp	Sun Nov  9 22:10:50 2003
@@ -16,6 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Function.h"
 #include "llvm/iTerminators.h"
@@ -66,13 +67,14 @@
   return I != E;
 }
 
-// SplitCriticalEdge - Insert a new node node to split the critical edge.  This
-// will update DominatorSet, ImmediateDominator and DominatorTree information if
-// it is available, thus calling this pass will not invalidate either of them.
+// SplitCriticalEdge - If this edge is a critical edge, insert a new node to
+// split the critical edge.  This will update DominatorSet, ImmediateDominator,
+// DominatorTree, and DominatorFrontier information if it is available, thus
+// calling this pass will not invalidate either of them.  This returns true if
+// the edge was split, false otherwise.
 //
-void SplitCriticalEdge(TerminatorInst *TI, unsigned SuccNum, Pass *P) {
-  assert(isCriticalEdge(TI, SuccNum) &&
-         "Cannot break a critical edge, if it isn't a critical edge");
+bool SplitCriticalEdge(TerminatorInst *TI, unsigned SuccNum, Pass *P) {
+  if (!isCriticalEdge(TI, SuccNum)) return false;
   BasicBlock *TIBB = TI->getParent();
   BasicBlock *DestBB = TI->getSuccessor(SuccNum);
 
@@ -100,7 +102,7 @@
   }
 
   // If we don't have a pass object, we can't update anything...
-  if (P == 0) return;
+  if (P == 0) return true;
 
   // Now update analysis information.  These are the analyses that we are
   // currently capable of updating...
@@ -142,6 +144,7 @@
     NewDFSet.insert(DestBB);
     DF->addBasicBlock(NewBB, NewDFSet);
   }
+  return true;
 }
 
 // runOnFunction - Loop over all of the edges in the CFG, breaking critical
@@ -153,8 +156,7 @@
     TerminatorInst *TI = I->getTerminator();
     if (TI->getNumSuccessors() > 1)
       for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
-        if (isCriticalEdge(TI, i)) {
-          SplitCriticalEdge(TI, i, this);
+        if (SplitCriticalEdge(TI, i, this)) {
           ++NumBroken;
           Changed = true;
         }




From lattner at cs.uiuc.edu  Sun Nov  9 22:18:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:18:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/CFG.h
Message-ID: <200311100417.WAA14514@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Support:

CFG.h updated: 1.15 -> 1.16

---
Log message:

Helper method


---
Diffs of the changes:  (+4 -0)

Index: llvm/include/llvm/Support/CFG.h
diff -u llvm/include/llvm/Support/CFG.h:1.15 llvm/include/llvm/Support/CFG.h:1.16
--- llvm/include/llvm/Support/CFG.h:1.15	Mon Oct 20 15:19:26 2003
+++ llvm/include/llvm/Support/CFG.h	Sun Nov  9 22:16:50 2003
@@ -111,6 +111,10 @@
     idx = I.idx;
     return *this;
   }
+
+  /// getSuccessorIndex - This is used to interface between code that wants to
+  /// operate on terminator instructions directly.
+  unsigned getSuccessorIndex() const { return Idx; }
     
   inline bool operator==(const _Self& x) const { return idx == x.idx; }
   inline bool operator!=(const _Self& x) const { return !operator==(x); }




From lattner at cs.uiuc.edu  Sun Nov  9 22:25:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:25:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/CFG.h
Message-ID: <200311100424.WAA18384@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Support:

CFG.h updated: 1.16 -> 1.17

---
Log message:

No really, I'm not on crack


---
Diffs of the changes:  (+1 -1)

Index: llvm/include/llvm/Support/CFG.h
diff -u llvm/include/llvm/Support/CFG.h:1.16 llvm/include/llvm/Support/CFG.h:1.17
--- llvm/include/llvm/Support/CFG.h:1.16	Sun Nov  9 22:16:50 2003
+++ llvm/include/llvm/Support/CFG.h	Sun Nov  9 22:23:52 2003
@@ -114,7 +114,7 @@
 
   /// getSuccessorIndex - This is used to interface between code that wants to
   /// operate on terminator instructions directly.
-  unsigned getSuccessorIndex() const { return Idx; }
+  unsigned getSuccessorIndex() const { return idx; }
     
   inline bool operator==(const _Self& x) const { return idx == x.idx; }
   inline bool operator!=(const _Self& x) const { return !operator==(x); }




From lattner at cs.uiuc.edu  Sun Nov  9 22:43:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:43:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
Message-ID: <200311100442.WAA28534@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.13 -> 1.14

---
Log message:

Reorganize code for locality, improve comments


---
Diffs of the changes:  (+23 -19)

Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.13 llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.14
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.13	Sun Nov  9 22:10:50 2003
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp	Sun Nov  9 22:42:42 2003
@@ -11,7 +11,8 @@
 // inserting a dummy basic block.  This pass may be "required" by passes that
 // cannot deal with critical edges.  For this usage, the structure type is
 // forward declared.  This pass obviously invalidates the CFG, but can update
-// forward dominator (set, immediate dominators, and tree) information.
+// forward dominator (set, immediate dominators, tree, and frontier)
+// information.
 //
 //===----------------------------------------------------------------------===//
 
@@ -49,6 +50,27 @@
 const PassInfo *BreakCriticalEdgesID = X.getPassInfo();
 Pass *createBreakCriticalEdgesPass() { return new BreakCriticalEdges(); }
 
+// runOnFunction - Loop over all of the edges in the CFG, breaking critical
+// edges as they are found.
+//
+bool BreakCriticalEdges::runOnFunction(Function &F) {
+  bool Changed = false;
+  for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) {
+    TerminatorInst *TI = I->getTerminator();
+    if (TI->getNumSuccessors() > 1)
+      for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
+        if (SplitCriticalEdge(TI, i, this)) {
+          ++NumBroken;
+          Changed = true;
+        }
+  }
+
+  return Changed;
+}
+
+//===----------------------------------------------------------------------===//
+//    Implementation of the external critical edge manipulation functions
+//===----------------------------------------------------------------------===//
 
 // isCriticalEdge - Return true if the specified edge is a critical edge.
 // Critical edges are edges from a block with multiple successors to a block
@@ -145,22 +167,4 @@
     DF->addBasicBlock(NewBB, NewDFSet);
   }
   return true;
-}
-
-// runOnFunction - Loop over all of the edges in the CFG, breaking critical
-// edges as they are found.
-//
-bool BreakCriticalEdges::runOnFunction(Function &F) {
-  bool Changed = false;
-  for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) {
-    TerminatorInst *TI = I->getTerminator();
-    if (TI->getNumSuccessors() > 1)
-      for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
-        if (SplitCriticalEdge(TI, i, this)) {
-          ++NumBroken;
-          Changed = true;
-        }
-  }
-
-  return Changed;
 }




From lattner at cs.uiuc.edu  Sun Nov  9 22:43:12 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Nov  9 22:43:12 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
Message-ID: <200311100442.WAA28523@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms/Utils:

BasicBlockUtils.h updated: 1.6 -> 1.7

---
Log message:

Include forms of SplitCriticalEdge which work correctly with pred/succ iterators


---
Diffs of the changes:  (+19 -0)

Index: llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
diff -u llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h:1.6 llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h:1.7
--- llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h:1.6	Sun Nov  9 22:10:27 2003
+++ llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h	Sun Nov  9 22:42:13 2003
@@ -18,6 +18,7 @@
 // FIXME: Move to this file: BasicBlock::removePredecessor, BB::splitBasicBlock
 
 #include "llvm/BasicBlock.h"
+#include "llvm/Support/CFG.h"
 class Instruction;
 class Pass;
 
@@ -63,5 +64,23 @@
 /// the edge was split, false otherwise.
 ///
 bool SplitCriticalEdge(TerminatorInst *TI, unsigned SuccNum, Pass *P = 0);
+
+inline bool SplitCriticalEdge(BasicBlock *BB, succ_iterator SI, Pass *P = 0) {
+  return SplitCriticalEdge(BB->getTerminator(), SI.getSuccessorIndex(), P);
+}
+
+/// SplitCriticalEdge - If the edge from *PI to BB is not critical, return
+/// false.  Otherwise, split all edges between the two blocks and return true.
+/// This updates all of the same analyses as the other SplitCriticalEdge
+/// function.
+inline bool SplitCriticalEdge(BasicBlock *Succ, pred_iterator PI, Pass *P = 0) {
+  BasicBlock *Pred = *PI;
+  bool MadeChange = false;
+  for (succ_iterator SI = succ_begin(Pred), E = succ_end(Pred); SI != E; ++SI)
+    if (*SI == Succ)
+      MadeChange |= SplitCriticalEdge(Pred, SI, P);
+  return MadeChange;
+}
+
 
 #endif






Variable	- Purpose -
CC	- Tells `configure` which C compiler to use. By default, - `configure` will look for the first GCC C compiler in - `PATH`. Use this variable to override - `configure`'s default behavior. -
CXX	- Tells `configure` which C++ compiler to use. By default, - `configure` will look for the first GCC C++ compiler in - `PATH`. Use this variable to override - `configure`'s default behavior. -

Variable	Purpose
CC	Tells `configure` which C compiler to use. By default, + `configure` will look for the first GCC C compiler in + `PATH`. Use this variable to override + `configure`'s default behavior.
CXX	Tells `configure` which C++ compiler to use. By default, + `configure` will look for the first GCC C++ compiler in + `PATH`. Use this variable to override + `configure`'s default behavior.

+ +Size of LLVM bytecode files +	+ +Size of native machine code for each program (generated by the JIT) +
+ +Time to run the LLVM optimizer on each program +

+ +Execution time for CBE generated executable +	+ +Execution time for the LLC generated executable +
+ +Execution time for program in the JIT +

OPTIONS

EXIT STATUS

- -LLVM: Frequently Asked Questions - -

-Licenses -

-Source Code -

-Build Problems -

Getting Started with the LLVM SystemBy: Guochun Shi, - Chris Lattner, - John Criswell, - Misha Brukman, and - Vikram Adve -

- An Example Using the LLVM Tool Chain -

- Common Problems -

Well Formedness

Type Classifications

Array Type

Overview:

Syntax:

Examples:

Function Type

Overview:

Syntax:

Examples:

Structure Type

Overview:

Syntax:

Examples:

Pointer Type

Overview:

Syntax:

Examples:

'ret' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Example:

'br' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Example:

'switch' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Implementation:

Example:

'invoke' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Example:

'unwind' Instruction

Syntax:

Overview:

Semantics:

'add' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Example:

'sub' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Example:

'mul' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Semantics:

Example:

'div' Instruction

Syntax:

Overview:

Arguments:

Semantics:

Getting Started with the LLVM System
By: Guochun Shi, - Chris Lattner, - John Criswell, - Misha Brukman, and - Vikram Adve -

'`ret`' Instruction

'`br`' Instruction

'`switch`' Instruction

'`invoke`' Instruction

'`unwind`' Instruction

'`add`' Instruction

'`sub`' Instruction

'`mul`' Instruction

'`div`' Instruction

'`rem`' Instruction

'`setcc`' Instructions

'`and`' Instruction

'`or`' Instruction

'`xor`' Instruction

'`shl`' Instruction