Reorganize llvm sources all under src/llvm

Author: greedy

build.xml

@@ -236,13 +236,13 @@ INITIALISATION
     </touch>
   </target>
 
-  <target name="check.llvm">
-    <available property="llvm.jar.available" file="${lib.dir}/llvm.jar"/>
+  <target name="check.llvmil">
+    <available property="llvmil.jar.available" file="${lib.dir}/llvmil.jar"/>
   </target>
 
-  <target name="init.llvm" depends="check.llvm" unless="llvm.jar.available">
-    <antcall target="libs.llvm.starr"/>
-    <copy todir="${lib.dir}" file="${build-libs.dir}/llvm.jar"/>
+  <target name="init.llvm" depends="check.llvmil" unless="llvmil.jar.available">
+    <antcall target="libs.llvmil.starr"/>
+    <copy todir="${lib.dir}" file="${build-libs.dir}/llvmil.jar"/>
   </target>
 
   <target name="init" depends="init.jars">
@@ -297,7 +297,7 @@ INITIALISATION
         <include name="fjbg.jar"/>
         <include name="msil.jar"/>
         <include name="forkjoin.jar"/>
-        <include name="llvm.jar"/>
+        <include name="llvmil.jar"/>
       </fileset>
       <pathelement location="${ant.jar}"/>
       <path refid="lib.extra"/>
@@ -655,13 +655,13 @@ QUICK BUILD (QUICK)
   <target name="quick.newlibs" depends="quick.lib" if="libs.outdated">
     <antcall target="libs.done" inheritRefs="true"/>
     <property name="fjbg.jar" value="${build-libs.dir}/fjbg.jar"/>
-    <property name="llvm.jar" value="${build-libs.dir}/llvm.jar"/>
+    <property name="llvmil.jar" value="${build-libs.dir}/llvmil.jar"/>
     <property name="msil.jar" value="${build-libs.dir}/msil.jar"/>
   </target>
 
   <target name="quick.libs" depends="quick.newlibs" unless="libs.outdated">
     <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/>
-    <property name="llvm.jar" value="${lib.dir}/llvm.jar"/>
+    <property name="llvmil.jar" value="${lib.dir}/llvmil.jar"/>
     <property name="msil.jar" value="${lib.dir}/msil.jar"/>
   </target>
 
@@ -985,7 +985,7 @@ PACKED QUICK BUILD (PACK)
       <fileset dir="${build-quick.dir}/classes/compiler"/>
       <!-- filemode / dirmode: see trac ticket #1294 -->
       <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
-      <zipfileset dirmode="755" filemode="644" src="${llvm.jar}"/>
+      <zipfileset dirmode="755" filemode="644" src="${llvmil.jar}"/>
       <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
     </jar>
     <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/>
@@ -1512,60 +1512,60 @@ LIBRARIES (MSIL, FJBG maybe later)
     </jar>
   </target>
 
-  <target name="libs.pre-llvm" depends="libs.start">
-    <uptodate property="libs.llvm.available" targetfile="${build-libs.dir}/llvm.complete">
-      <srcfiles dir="${src.dir}/llvm">
+  <target name="libs.pre-llvmil" depends="libs.start">
+    <uptodate property="libs.llvmil.available" targetfile="${build-libs.dir}/llvmil.complete">
+      <srcfiles dir="${src.dir}/llvm/llvmil">
 	<include name="**/*.java"/>
 	<include name="**/*.scala"/>
       </srcfiles>
     </uptodate>
   </target>
 
-  <target name="libs.llvm.starr" depends="init">
-    <mkdir dir="${build-libs.dir}/classes/llvm"/>
+  <target name="libs.llvmil.starr" depends="init">
+    <mkdir dir="${build-libs.dir}/classes/llvmil"/>
     <scalacfork
-      destdir="${build-libs.dir}/classes/llvm"
+      destdir="${build-libs.dir}/classes/llvmil"
       compilerpathref="starr.classpath"
       params="${scalac.args.all}"
-      srcdir="${src.dir}/llvm"
+      srcdir="${src.dir}/llvm/llvmil"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${lib.starr.jar}"/>
       </compilationpath>
     </scalacfork>
-    <touch file="${build-libs.dir}/llvm.complete" verbose="no"/>
-    <jar destfile="${build-libs.dir}/llvm.jar">
-      <fileset dir="${build-libs.dir}/classes/llvm"/>
+    <touch file="${build-libs.dir}/llvmil.complete" verbose="no"/>
+    <jar destfile="${build-libs.dir}/llvmil.jar">
+      <fileset dir="${build-libs.dir}/classes/llvmil"/>
     </jar>
   </target>
 
-  <target name="libs.llvm" depends="libs.pre-llvm" unless="libs.llvm.available">
-    <mkdir dir="${build-libs.dir}/classes/llvm"/>
+  <target name="libs.llvmil" depends="libs.pre-llvmil" unless="libs.llvmil.available">
+    <mkdir dir="${build-libs.dir}/classes/llvmil"/>
     <scalacfork
-      destdir="${build-libs.dir}/classes/llvm"
+      destdir="${build-libs.dir}/classes/llvmil"
       compilerpathref="locker.classpath"
       params="${scalac.args.all}"
-      srcdir="${src.dir}/llvm"
+      srcdir="${src.dir}/llvm/llvmil"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
       <compilationpath>
 	<pathelement location="${build-quick.dir}/classes/library"/>
       </compilationpath>
     </scalacfork>
-    <touch file="${build-libs.dir}/llvm.complete" verbose="no"/>
+    <touch file="${build-libs.dir}/llvmil.complete" verbose="no"/>
   </target>
 
-  <target name="libs.pre-llvmpack" depends="libs.llvm">
+  <target name="libs.pre-llvmilpack" depends="libs.llvmil">
   </target>
 
-  <target name="libs.llvmpack" depends="libs.pre-llvmpack" unless="libs.llvmpack.available">
-    <jar destfile="${build-libs.dir}/llvm.jar">
-      <fileset dir="${build-libs.dir}/classes/llvm"/>
+  <target name="libs.llvmilpack" depends="libs.pre-llvmilpack" unless="libs.llvmilpack.available">
+    <jar destfile="${build-libs.dir}/llvmil.jar">
+      <fileset dir="${build-libs.dir}/classes/llvmil"/>
     </jar>
   </target>
 
-  <target name="libs.done" depends="libs.msilpack, libs.fjbgpack, libs.llvmpack"/>
+  <target name="libs.done" depends="libs.msilpack, libs.fjbgpack, libs.llvmilpack"/>
 
   <target name="forkjoin.done" depends="libs.forkjoinpack"/>
 
@@ -2073,7 +2073,7 @@ STABLE REFERENCE (STARR)
     <copy toDir="${lib.dir}" overwrite="yes">
       <fileset dir="${build-libs.dir}">
         <include name="fjbg.jar"/>
-        <include name="llvm.jar"/>
+        <include name="llvmil.jar"/>
         <include name="msil.jar"/>
         <include name="forkjoin.jar"/>
       </fileset>

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT([scala-llvm],[0])
-AC_CONFIG_SRCDIR([src/llvm-ffi/scala/ffi/ctypes.scala.in])
+AC_CONFIG_SRCDIR([src/llvm/library/scala/ffi/ctypes.scala.in])
 
 AC_DEFUN([CHECK_INT_TYPE],[
   AC_CHECK_SIZEOF([$1])
@@ -34,6 +34,6 @@ CHECK_ALIGNMENT([int64_t])
 CHECK_ALIGNMENT([float])
 CHECK_ALIGNMENT([double])
 
-AC_CONFIG_SUBDIRS([src/llvmrt])
-AC_CONFIG_FILES([src/llvm-ffi/scala/ffi/ctypes.scala])
+AC_CONFIG_SUBDIRS([src/llvm/runtime])
+AC_CONFIG_FILES([src/llvm/library/scala/ffi/ctypes.scala])
 AC_OUTPUT

docs/examples/llvm/Makefile

@@ -5,11 +5,11 @@ SCALAC=JAVA_OPTS=-Xmx500M ../../../build/quick/bin/scalac
 SLFLAGS=-no-specialization -target:llvm
 
 run-sample:
-	make -C ../../../src/llvmrt llvmrt.a runscala
+	make -C ../../../src/llvm/runtime llvmrt.a runscala
 	rm -rf irfiles/example irfiles/example.stamp
 	rm -rf bin/example.bc bin/example.aot
 	make irfiles/example.stamp bin/example.bc
-	../../../src/llvmrt/runscala bin/example.bc example
+	../../../src/llvm/runtime/runscala bin/example.bc example
 
 run-sample-jvm:
 	make classes
@@ -51,13 +51,13 @@ bin/%.bc: irfiles/%.stamp
 	for x in irfiles/$*/*.ll ; do \
 	  llvm-as $$x; \
 	done
-	llvm-ld -o $@ -r -disable-internalize irfiles/$*/*.bc ../../../src/llvmrt/llvmrt.a
+	llvm-ld -o $@ -r -disable-internalize irfiles/$*/*.bc ../../../src/llvm/runtime/llvmrt.a
 	opt -O3 -o bin/$*.opt.bc $@
 	mv bin/$*.opt.bc $@
 
 bin/%.aot: bin/%.bc
-	../../../src/llvmrt/linkscala $< `basename $*`
-	llvm-ld -v -native -o $@ b.out.bc ../../../src/llvmrt/llvmrt.a -lapr-1 -L/usr/lib64 `icu-config --ldflags-libsonly ` ../../../src/llvmrt/unwind.o
+	../../../src/llvm/runtime/linkscala $< `basename $*`
+	llvm-ld -v -native -o $@ b.out.bc ../../../src/llvm/runtime/llvmrt.a -lapr-1 -L/usr/lib64 `icu-config --ldflags-libsonly ` ../../../src/llvm/runtime/unwind.o
 	rm -f b.out.bc
 
 classes: example.scala

docs/examples/llvm/ffi.sources

@@ -1,6 +1,6 @@
-../../../src/llvm-ffi/scala/ffi/ctypes.scala
-../../../src/llvm-ffi/scala/ffi/package.scala
-../../../src/llvm-ffi/scala/ffi/Ptr.scala
-../../../src/llvm-ffi/scala/ffi/Storable.scala
-../../../src/llvm-ffi/scala/ffi/alloc.scala
-../../../src/llvm-ffi/scala/ffi/foreign.scala
+../../../src/llvm/library/scala/ffi/ctypes.scala
+../../../src/llvm/library/scala/ffi/package.scala
+../../../src/llvm/library/scala/ffi/Ptr.scala
+../../../src/llvm/library/scala/ffi/Storable.scala
+../../../src/llvm/library/scala/ffi/alloc.scala
+../../../src/llvm/library/scala/ffi/foreign.scala