diff options
106 files changed, 188 insertions, 12991 deletions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 28a70d2879..53043cd99f 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-LazyStart: true Bundle-ClassPath: ., bin, - lib/fjbg.jar, lib/jline.jar, lib/msil.jar Export-Package: @@ -50,8 +49,6 @@ Export-Package: ch.epfl.lamp.compiler.msil, ch.epfl.lamp.compiler.msil.emit, ch.epfl.lamp.compiler.msil.util, - ch.epfl.lamp.fjbg, - ch.epfl.lamp.util Require-Bundle: org.apache.ant, org.scala-ide.scala.library diff --git a/README.rst b/README.rst index 72c4b6028b..7a1ed1dcf4 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,6 @@ build script or user-created if needed. This is not a complete listing. :: +--dist/ The destination folder for Scala distributions. +--docs/ Documentation and sample code. +--lib/ Pre-compiled libraries for the build. - | +--fjbg.jar The Java byte-code generation library. | +--scala-compiler.jar The stable reference ('starr') compiler jar | +--scala-library.jar The stable reference ('starr') library jar | +--scala-library-src.jar A snapshot of the source used to build starr. diff --git a/build.detach.xml b/build.detach.xml index b13528f462..03360e36d5 100644 --- a/build.detach.xml +++ b/build.detach.xml @@ -72,7 +72,6 @@ QUICK BUILD (QUICK) <path id="quick.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> - <pathelement location="${lib.dir}/fjbg.jar"/> <pathelement location="${lib.dir}/forkjoin.jar"/> <pathelement location="${ant.home}/lib/ant.jar"/> </path> diff --git a/build.examples.xml b/build.examples.xml index 1cebf33a59..82432121ca 100644 --- a/build.examples.xml +++ b/build.examples.xml @@ -28,8 +28,6 @@ PROPERTIES <!-- Location of pre-compiled libraries properties --> <property name="scala.lib.jar" value="${lib.dir}/scala-library.jar"/> <property name="scala.comp.jar" value="${lib.dir}/scala-compiler.jar"/> - <property name="fjbg.name" value="fjbg.jar"/> - <property name="fjbg.jar" value="${lib.dir}/${fjbg.name}"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="ant-contrib.jar" value="${lib.dir}/ant/ant-contrib.jar"/> <!-- --> @@ -79,15 +77,6 @@ INITIALISATION /> </not></condition> </fail> - <echo level="verbose" message="fjbg.jar=${fjbg.jar}"/> - <fail message="FJBG library in '${lib.dir}/' is not available"> - <condition><not> - <available - classname="ch.epfl.lamp.fjbg.JCode" - classpath="${fjbg.jar}" - /> - </not></condition> - </fail> <echo level="verbose" message="ant.jar=${ant.jar}"/> <echo level="verbose" message="ant-contrib.jar=${ant-contrib.jar}"/> <fail message="Additional Ant tasks in '${lib.dir}/' is not available"> @@ -99,13 +88,9 @@ INITIALISATION </not></condition> </fail> <!-- Creating class-pathes --> - <path id="common.classpath"> - <pathelement location="${fjbg.jar}"/> - </path> <path id="scala.classpath"> <pathelement location="${scala.lib.jar}"/> <pathelement location="${scala.comp.jar}"/> - <path refid="common.classpath"/> </path> <!-- Creating boot-level tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml"> @@ -460,7 +460,6 @@ INITIALISATION <!-- Libraries only used for STARR --> <path id="starr.dep.libs"> <fileset dir="${lib.dir}"> - <include name="fjbg.jar"/> <include name="forkjoin.jar"/> </fileset> </path> @@ -591,57 +590,10 @@ LOCAL DEPENDENCY (FORKJOIN) </target> <!-- =========================================================================== -LOCAL DEPENDENCY (FJBG) -============================================================================ --> - - <target name="fjbg.init" depends="init"> - <uptodate property="fjbg.available" targetfile="${build-libs.dir}/fjbg.complete"> - <srcfiles dir="${src.dir}/fjbg"> - <include name="**/*.java"/> - <include name="**/*.scala"/> - </srcfiles> - </uptodate> - </target> - - <target name="fjbg.lib" depends="fjbg.init" unless="fjbg.available"> - <stopwatch name="fjbg.lib.timer" /> - <mkdir dir="${build-libs.dir}/classes/fjbg"/> - <javac - srcdir="${src.dir}/fjbg" - destdir="${build-libs.dir}/classes/fjbg" - classpath="${build-libs.dir}/classes/fjbg" - includes="**/*.java" - debug="true" - target="1.6" source="1.4"> - <compilerarg line="${javac.args} -XDignore.symbol.file"/> - </javac> - <touch file="${build-libs.dir}/fjbg.complete" verbose="no"/> - <stopwatch name="fjbg.lib.timer" action="total"/> - </target> - - <target name="fjbg.pack" depends="fjbg.lib"> - <jar destfile="${build-libs.dir}/fjbg.jar"> - <fileset dir="${build-libs.dir}/classes/fjbg"/> - </jar> - </target> - - <target name="fjbg.done" depends="fjbg.pack"> - <!-- TODO - jar or classfiles? --> - <path id="fjbg.classpath"> - <pathelement location="${build-libs.dir}/classes/fjbg"/> - </path> - </target> - - <target name="fjbg.clean" depends="init"> - <delete dir="${build-libs.dir}/classes/fjbg" includeemptydirs="yes" quiet="yes" failonerror="no"/> - <delete file="${build-libs.dir}/fjbg.complete" quiet="yes" failonerror="no"/> - </target> - -<!-- =========================================================================== LOCAL REFERENCE BUILD (LOCKER) ============================================================================ --> - <target name="locker.start" depends="asm.done, forkjoin.done, fjbg.done"> + <target name="locker.start" depends="asm.done, forkjoin.done"> <condition property="locker.available"> <available file="${build-locker.dir}/all.complete"/> </condition> @@ -767,7 +719,6 @@ LOCAL REFERENCE BUILD (LOCKER) <pathelement location="${build-locker.dir}/classes/library"/> <pathelement location="${build-locker.dir}/classes/reflect"/> <pathelement location="${build-locker.dir}/classes/compiler"/> - <path refid="fjbg.classpath"/> <path refid="aux.libs"/> <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> @@ -802,7 +753,6 @@ LOCAL REFERENCE BUILD (LOCKER) <pathelement location="${build-locker.dir}/classes/library"/> <pathelement location="${build-locker.dir}/classes/reflect"/> <pathelement location="${build-locker.dir}/classes/compiler"/> - <path refid="fjbg.classpath"/> <path refid="forkjoin.classpath"/> <path refid="asm.classpath"/> <path refid="aux.libs"/> @@ -812,7 +762,6 @@ LOCAL REFERENCE BUILD (LOCKER) <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> - <path refid="fjbg.classpath"/> <path refid="forkjoin.classpath"/> <path refid="asm.classpath"/> <path refid="aux.libs"/> @@ -910,7 +859,6 @@ PACKED LOCKER BUILD (PALO) <jar destfile="${build-palo.dir}/lib/scala-compiler.jar" manifest="${basedir}/META-INF/MANIFEST.MF"> <fileset dir="${build-locker.dir}/classes/compiler"/> <fileset dir="${build-asm.dir}/classes/"/> - <fileset dir="${build-libs.dir}/classes/fjbg"/> </jar> <copy file="${jline.jar}" toDir="${build-palo.dir}/lib"/> </target> @@ -1133,7 +1081,6 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/compiler"/> <path refid="aux.libs"/> <path refid="forkjoin.classpath"/> - <path refid="fjbg.classpath"/> <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> </compilationpath> @@ -1184,7 +1131,6 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/continuations-plugin"/> <path refid="forkjoin.classpath"/> - <path refid="fjbg.classpath"/> <path refid="aux.libs"/> </compilationpath> </scalacfork> @@ -1306,7 +1252,6 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/partest"/> <pathelement location="${ant.jar}"/> <path refid="forkjoin.classpath"/> - <path refid="fjbg.classpath"/> <pathelement location="${scalacheck.jar}"/> </compilationpath> </scalacfork> @@ -1336,7 +1281,6 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <path refid="forkjoin.classpath"/> - <path refid="fjbg.classpath"/> <path refid="aux.libs"/> <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> @@ -1463,7 +1407,6 @@ PACKED QUICK BUILD (PACK) <jar destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF"> <fileset dir="${build-quick.dir}/classes/compiler"/> <fileset dir="${build-asm.dir}/classes"/> - <fileset dir="${build-libs.dir}/classes/fjbg"/> </jar> <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/> <copy todir="${build-pack.dir}/lib"> @@ -1888,7 +1831,6 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/compiler"/> <path refid="aux.libs"/> <path refid="forkjoin.classpath"/> - <path refid="fjbg.classpath"/> <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> </compilationpath> @@ -1939,7 +1881,6 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/continuations-plugin"/> <path refid="forkjoin.classpath"/> - <path refid="fjbg.classpath"/> <path refid="aux.libs"/> </compilationpath> </scalacfork> @@ -2071,7 +2012,7 @@ BOOTSTRAPPING BUILD (STRAP) </target> <!-- =========================================================================== -LIBRARIES (Forkjoin, FJBG, ASM) +LIBRARIES (Forkjoin, ASM) ============================================================================ --> @@ -2737,7 +2678,6 @@ STABLE REFERENCE (STARR) <jar destfile="${basedir}/lib/scala-compiler-src.jar"> <fileset dir="${basedir}/src/compiler"/> <fileset dir="${basedir}/src/asm"/> - <fileset dir="${basedir}/src/fjbg"/> </jar> </target> diff --git a/lib/fjbg.jar.desired.sha1 b/lib/fjbg.jar.desired.sha1 deleted file mode 100644 index 6f3ccc77bd..0000000000 --- a/lib/fjbg.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -8acc87f222210b4a5eb2675477602fc1759e7684 *fjbg.jar diff --git a/project/Build.scala b/project/Build.scala index 80a3fb42f1..efa8a7a038 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -24,7 +24,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing { ) // Collections of projects to run 'compile' on. - lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin, fjbg) + lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin) // Collection of projects to 'package' and 'publish' together. lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, actors, continuationsPlugin, jline, scalap) lazy val partestRunProjects = Seq(testsuite, continuationsTestsuite) @@ -82,7 +82,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing { makeExplodedDist <<= (makeExplodedDist in scaladist).identity, // Note: We override unmanagedSources so that ~ compile will look at all these sources, then run our aggregated compile... unmanagedSourceDirectories in Compile <<= baseDirectory apply (_ / "src") apply { dir => - Seq("library/scala","actors","compiler","fjbg","swing","continuations/library","forkjoin") map (dir / _) + Seq("library/scala","actors","compiler","swing","continuations/library","forkjoin") map (dir / _) }, // TODO - Make exported products == makeDist so we can use this when creating a *real* distribution. commands += Release.pushStarr @@ -132,8 +132,6 @@ object ScalaBuild extends Build with Layers with Packaging with Testing { // Jline nested project. Compile this sucker once and be done. lazy val jline = Project("jline", file("src/jline")) - // Fast Java Bytecode Generator (nested in every scala-compiler.jar) - lazy val fjbg = Project("fjbg", file(".")) settings(settingOverrides : _*) // Our wrapped version of asm. lazy val asm = Project("asm", file(".")) settings(settingOverrides : _*) // Forkjoin backport @@ -283,7 +281,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing { // -------------------------------------------------------------- // Real Compiler Artifact // -------------------------------------------------------------- - lazy val packageScalaBinTask = Seq(quickComp, fjbg, asm).map(p => products in p in Compile).join.map(_.flatten).map(productTaskToMapping) + lazy val packageScalaBinTask = Seq(quickComp, asm).map(p => products in p in Compile).join.map(_.flatten).map(productTaskToMapping) lazy val scalaBinArtifactSettings : Seq[Setting[_]] = inConfig(Compile)(Defaults.packageTasks(packageBin, packageScalaBinTask)) ++ Seq( name := "scala-compiler", crossPaths := false, @@ -331,6 +329,6 @@ object ScalaBuild extends Build with Layers with Packaging with Testing { lazy val documentation = ( Project("documentation", file(".")) settings (documentationSettings: _*) - dependsOn(quickLib, quickComp, actors, fjbg, forkjoin, swing, continuationsLibrary) + dependsOn(quickLib, quickComp, actors, forkjoin, swing, continuationsLibrary) ) } diff --git a/project/Layers.scala b/project/Layers.scala index 259e460a52..6c939d0ff7 100644 --- a/project/Layers.scala +++ b/project/Layers.scala @@ -13,8 +13,6 @@ trait Layers extends Build { def jline: Project /** Reference to forkjoin library */ def forkjoin: Project - /** Reference to Fast-Java-Bytecode-Generator library */ - def fjbg: Project /** Reference to the ASM wrapped project. */ def asm: Project /** A setting that adds some external dependencies. */ @@ -23,7 +21,7 @@ trait Layers extends Build { def aaa_root: Project /** Creates a reference Scala version that can be used to build other projects. This takes in the raw - * library, compiler and fjbg libraries as well as a string representing the layer name (used for compiling the compile-interface). + * library, compiler as well as a string representing the layer name (used for compiling the compile-interface). */ def makeScalaReference(layer: String, library: Project, reflect: Project, compiler: Project) = scalaInstance <<= (appConfiguration in library, @@ -31,10 +29,9 @@ trait Layers extends Build { (exportedProducts in library in Compile), (exportedProducts in reflect in Compile), (exportedProducts in compiler in Compile), - (exportedProducts in fjbg in Compile), (fullClasspath in jline in Runtime), (exportedProducts in asm in Runtime)) map { - (app, version: String, lib: Classpath, reflect: Classpath, comp: Classpath, fjbg: Classpath, jline: Classpath, asm: Classpath) => + (app, version: String, lib: Classpath, reflect: Classpath, comp: Classpath, jline: Classpath, asm: Classpath) => val launcher = app.provider.scalaProvider.launcher (lib,comp) match { case (Seq(libraryJar), Seq(compilerJar)) => @@ -43,23 +40,23 @@ trait Layers extends Build { libraryJar.data, compilerJar.data, launcher, - ((fjbg.files ++ jline.files ++ asm.files ++ reflect.files):_*)) + ((jline.files ++ asm.files ++ reflect.files):_*)) case _ => error("Cannot build a ScalaReference with more than one classpath element") } } - + /** Creates a "layer" of Scala compilation. That is, this will build the next version of Scala from a previous version. * Returns the library project and compiler project from the next layer. - * Note: The library and compiler are not *complete* in the sense that they are missing things like "actors" and "fjbg". + * Note: The library and compiler are not *complete* in the sense that they are missing things like "actors". */ def makeLayer(layer: String, referenceScala: Setting[Task[ScalaInstance]], autoLock: Boolean = false) : (Project, Project, Project) = { - val autoLockSettings: Seq[Setting[_]] = - if(autoLock) Seq(compile in Compile <<= (compile in Compile, lock) apply { (c, l) => + val autoLockSettings: Seq[Setting[_]] = + if(autoLock) Seq(compile in Compile <<= (compile in Compile, lock) apply { (c, l) => c flatMapR { cResult => val result = Result.tryValue(cResult) l mapR { tx => result } } - }) + }) else Seq.empty @@ -69,7 +66,7 @@ trait Layers extends Build { unmanagedClasspath in Compile <<= (exportedProducts in forkjoin in Compile).identity, managedClasspath in Compile := Seq(), scalaSource in Compile <<= (baseDirectory) apply (_ / "src" / "library"), - resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "library"), + resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "library"), defaultExcludes in unmanagedResources := ("*.scala" | "*.java" | "*.disabled"), // TODO - Allow other scalac option settings. scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-sourcepath", src.getAbsolutePath)), @@ -107,7 +104,7 @@ trait Layers extends Build { dirs.descendentsExcept( ("*.xml" | "*.html" | "*.gif" | "*.png" | "*.js" | "*.css" | "*.tmpl" | "*.swf" | "*.properties" | "*.txt"),"*.scala").get }, // TODO - Use depends on *and* SBT's magic dependency mechanisms... - unmanagedClasspath in Compile <<= Seq(forkjoin, library, reflect, fjbg, jline, asm).map(exportedProducts in Compile in _).join.map(_.flatten), + unmanagedClasspath in Compile <<= Seq(forkjoin, library, reflect, jline, asm).map(exportedProducts in Compile in _).join.map(_.flatten), externalDeps, referenceScala ) diff --git a/project/Packaging.scala b/project/Packaging.scala index eb4e69f99e..6cb51a10a6 100644 --- a/project/Packaging.scala +++ b/project/Packaging.scala @@ -19,7 +19,7 @@ trait Packaging { self: ScalaBuild.type => genBin <<= genBinTask(genBinRunner, binDir, fullClasspath in Runtime, false), binDir in genBinQuick <<= baseDirectory apply (_ / "target" / "bin"), // Configure the classpath this way to avoid having .jar files and previous layers on the classpath. - fullClasspath in Runtime in genBinQuick <<= Seq(quickComp,quickLib,scalap,actors,swing,fjbg,jline,forkjoin).map(classDirectory in Compile in _).join.map(Attributed.blankSeq), + fullClasspath in Runtime in genBinQuick <<= Seq(quickComp,quickLib,scalap,actors,swing,jline,forkjoin).map(classDirectory in Compile in _).join.map(Attributed.blankSeq), fullClasspath in Runtime in genBinQuick <++= (fullClasspath in Compile in jline), genBinQuick <<= genBinTask(genBinRunner, binDir in genBinQuick, fullClasspath in Runtime in genBinQuick, true), runManmakerMan <<= runManmakerTask(fullClasspath in Runtime in manmaker, runner in manmaker, "scala.tools.docutil.EmitManPage", "man1", ".1"), diff --git a/project/Testing.scala b/project/Testing.scala index 5de72116a3..de63a66164 100644 --- a/project/Testing.scala +++ b/project/Testing.scala @@ -34,7 +34,7 @@ trait Testing { self: ScalaBuild.type => val continuationsTestsuite = ( Project("continuations-testsuite", file(".")) settings (continuationsTestsuiteSettings:_*) - dependsOn (partest, scalaLibrary, scalaCompiler, fjbg) + dependsOn (partest, scalaLibrary, scalaCompiler) ) } diff --git a/src/compiler/scala/reflect/reify/codegen/GenSymbols.scala b/src/compiler/scala/reflect/reify/codegen/GenSymbols.scala index 39103b801e..731aab93b8 100644 --- a/src/compiler/scala/reflect/reify/codegen/GenSymbols.scala +++ b/src/compiler/scala/reflect/reify/codegen/GenSymbols.scala @@ -98,7 +98,7 @@ trait GenSymbols { def reifyFreeTerm(binding: Tree): Tree = reifyIntoSymtab(binding.symbol) { sym => if (reifyDebug) println("Free term" + (if (sym.isCapturedVariable) " (captured)" else "") + ": " + sym + "(" + sym.accurateKindString + ")") - val name = newTermName(nme.REIFY_FREE_PREFIX + sym.name + (if (sym.isType) nme.REIFY_FREE_THIS_SUFFIX else "")) + val name = newTermName("" + nme.REIFY_FREE_PREFIX + sym.name + (if (sym.isType) nme.REIFY_FREE_THIS_SUFFIX else "")) if (sym.isCapturedVariable) { assert(binding.isInstanceOf[Ident], showRaw(binding)) val capturedBinding = referenceCapturedVariable(sym) @@ -112,14 +112,14 @@ trait GenSymbols { reifyIntoSymtab(binding.symbol) { sym => if (reifyDebug) println("Free type: %s (%s)".format(sym, sym.accurateKindString)) state.reificationIsConcrete = false - val name = newTermName(nme.REIFY_FREE_PREFIX + sym.name) + val name: TermName = nme.REIFY_FREE_PREFIX append sym.name Reification(name, binding, mirrorBuildCall(nme.newFreeType, reify(sym.name.toString), mirrorBuildCall(nme.flagsFromBits, reify(sym.flags)), reify(origin(sym)))) } def reifySymDef(sym: Symbol): Tree = reifyIntoSymtab(sym) { sym => if (reifyDebug) println("Sym def: %s (%s)".format(sym, sym.accurateKindString)) - val name = newTermName(nme.REIFY_SYMDEF_PREFIX + sym.name) + val name: TermName = nme.REIFY_SYMDEF_PREFIX append sym.name def reifiedOwner = if (sym.owner.isLocatable) reify(sym.owner) else reifySymDef(sym.owner) Reification(name, Ident(sym), mirrorBuildCall(nme.newNestedSymbol, reifiedOwner, reify(sym.name), reify(sym.pos), mirrorBuildCall(nme.flagsFromBits, reify(sym.flags)), reify(sym.isClass))) } @@ -143,7 +143,7 @@ trait GenSymbols { val reification = reificode(sym) import reification.{name, binding} val tree = reification.tree updateAttachment ReifyBindingAttachment(binding) - state.symtab += (sym, name, tree) + state.symtab += (sym, name.toTermName, tree) } fromSymtab } diff --git a/src/compiler/scala/reflect/reify/codegen/GenUtils.scala b/src/compiler/scala/reflect/reify/codegen/GenUtils.scala index e2275f79ff..c684f16325 100644 --- a/src/compiler/scala/reflect/reify/codegen/GenUtils.scala +++ b/src/compiler/scala/reflect/reify/codegen/GenUtils.scala @@ -30,41 +30,35 @@ trait GenUtils { def call(fname: String, args: Tree*): Tree = Apply(termPath(fname), args.toList) - def mirrorSelect(name: String): Tree = - termPath(nme.UNIVERSE_PREFIX + name) + def mirrorSelect(name: String): Tree = termPath(nme.UNIVERSE_PREFIX + name) + def mirrorSelect(name: TermName): Tree = mirrorSelect(name.toString) - def mirrorBuildSelect(name: String): Tree = - termPath(nme.UNIVERSE_BUILD_PREFIX + name) + def mirrorBuildSelect(name: TermName): Tree = + termPath("" + nme.UNIVERSE_BUILD_PREFIX + name) - def mirrorMirrorSelect(name: String): Tree = - termPath(nme.MIRROR_PREFIX + name) + def mirrorMirrorSelect(name: TermName): Tree = + termPath("" + nme.MIRROR_PREFIX + name) def mirrorCall(name: TermName, args: Tree*): Tree = - call("" + (nme.UNIVERSE_PREFIX append name), args: _*) - - def mirrorCall(name: String, args: Tree*): Tree = - call(nme.UNIVERSE_PREFIX + name, args: _*) + call("" + nme.UNIVERSE_PREFIX + name, args: _*) def mirrorBuildCall(name: TermName, args: Tree*): Tree = - call("" + (nme.UNIVERSE_BUILD_PREFIX append name), args: _*) - - def mirrorBuildCall(name: String, args: Tree*): Tree = - call(nme.UNIVERSE_BUILD_PREFIX + name, args: _*) + call("" + nme.UNIVERSE_BUILD_PREFIX + name, args: _*) def mirrorMirrorCall(name: TermName, args: Tree*): Tree = - call("" + (nme.MIRROR_PREFIX append name), args: _*) - - def mirrorMirrorCall(name: String, args: Tree*): Tree = - call(nme.MIRROR_PREFIX + name, args: _*) + call("" + nme.MIRROR_PREFIX + name, args: _*) def mirrorFactoryCall(value: Product, args: Tree*): Tree = mirrorFactoryCall(value.productPrefix, args: _*) - def mirrorFactoryCall(prefix: String, args: Tree*): Tree = - mirrorCall(prefix, args: _*) + def mirrorFactoryCall(prefix: TermName, args: Tree*): Tree = + mirrorCall("" + prefix, args: _*) + + def scalaFactoryCall(name: TermName, args: Tree*): Tree = + call(s"scala.$name.apply", args: _*) def scalaFactoryCall(name: String, args: Tree*): Tree = - call("scala." + name + ".apply", args: _*) + scalaFactoryCall(name: TermName, args: _*) def mkList(args: List[Tree]): Tree = scalaFactoryCall("collection.immutable.List", args: _*) diff --git a/src/compiler/scala/reflect/reify/phases/Reshape.scala b/src/compiler/scala/reflect/reify/phases/Reshape.scala index f31c3d4755..75384ddce1 100644 --- a/src/compiler/scala/reflect/reify/phases/Reshape.scala +++ b/src/compiler/scala/reflect/reify/phases/Reshape.scala @@ -254,7 +254,7 @@ trait Reshape { val flags1 = (flags0 & GetterFlags) & ~(STABLE | ACCESSOR | METHOD) val mods1 = Modifiers(flags1, privateWithin0, annotations0) setPositions mods0.positions val mods2 = toPreTyperModifiers(mods1, ddef.symbol) - ValDef(mods2, name1, tpt0, extractRhs(rhs0)) + ValDef(mods2, name1.toTermName, tpt0, extractRhs(rhs0)) } private def trimAccessors(deff: Tree, stats: List[Tree]): List[Tree] = { @@ -293,7 +293,7 @@ trait Reshape { } val mods2 = toPreTyperModifiers(mods1, vdef.symbol) val name1 = nme.dropLocalSuffix(name) - val vdef1 = ValDef(mods2, name1, tpt, rhs) + val vdef1 = ValDef(mods2, name1.toTermName, tpt, rhs) if (reifyDebug) println("resetting visibility of field: %s => %s".format(vdef, vdef1)) Some(vdef1) // no copyAttrs here, because new ValDef and old symbols are now out of sync case ddef: DefDef if !ddef.mods.isLazy => diff --git a/src/compiler/scala/reflect/reify/utils/NodePrinters.scala b/src/compiler/scala/reflect/reify/utils/NodePrinters.scala index 97ec479a6c..86e50e0a68 100644 --- a/src/compiler/scala/reflect/reify/utils/NodePrinters.scala +++ b/src/compiler/scala/reflect/reify/utils/NodePrinters.scala @@ -75,10 +75,10 @@ trait NodePrinters { printout += universe.trim if (mirrorIsUsed) printout += mirror.replace("Mirror[", "scala.reflect.api.Mirror[").trim val imports = scala.collection.mutable.ListBuffer[String](); - imports += nme.UNIVERSE_SHORT + imports += nme.UNIVERSE_SHORT.toString // if (buildIsUsed) imports += nme.build - if (mirrorIsUsed) imports += nme.MIRROR_SHORT - if (flagsAreUsed) imports += nme.Flag + if (mirrorIsUsed) imports += nme.MIRROR_SHORT.toString + if (flagsAreUsed) imports += nme.Flag.toString printout += s"""import ${imports map (_ + "._") mkString ", "}""" val name = if (isExpr) "tree" else "tpe" diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala index e6671ba093..3b8ae202f6 100644 --- a/src/compiler/scala/tools/ant/Scalac.scala +++ b/src/compiler/scala/tools/ant/Scalac.scala @@ -98,7 +98,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared { /** Defines valid values for the `target` property. */ object Target extends PermissibleValue { - val values = List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7") + val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7") } /** Defines valid values for the `deprecation` and `unchecked` properties. */ diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 654dc92a9e..34d5d10cbf 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -24,7 +24,7 @@ import typechecker._ import transform._ import backend.icode.{ ICodes, GenICode, ICodeCheckers } import backend.{ ScalaPrimitives, Platform, JavaPlatform } -import backend.jvm.{GenJVM, GenASM} +import backend.jvm.GenASM import backend.opt.{ Inliners, InlineExceptionHandlers, ClosureElimination, DeadCodeElimination } import backend.icode.analysis._ import scala.language.postfixOps @@ -593,13 +593,6 @@ class Global(var currentSettings: Settings, var reporter: Reporter) val runsRightAfter = None } with DeadCodeElimination - // phaseName = "jvm", FJBG-based version - object genJVM extends { - val global: Global.this.type = Global.this - val runsAfter = List("dce") - val runsRightAfter = None - } with GenJVM - // phaseName = "jvm", ASM-based version object genASM extends { val global: Global.this.type = Global.this diff --git a/src/compiler/scala/tools/nsc/ast/TreeDSL.scala b/src/compiler/scala/tools/nsc/ast/TreeDSL.scala index e8bc932bf5..3129748e9f 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeDSL.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeDSL.scala @@ -181,7 +181,7 @@ trait TreeDSL { self: VODDStart => type ResultTreeType = ValDef - def mkTree(rhs: Tree): ValDef = ValDef(mods, name, tpt, rhs) + def mkTree(rhs: Tree): ValDef = ValDef(mods, name.toTermName, tpt, rhs) } trait DefCreator { self: VODDStart => diff --git a/src/compiler/scala/tools/nsc/ast/TreeGen.scala b/src/compiler/scala/tools/nsc/ast/TreeGen.scala index 1adcf46958..9e98e9b0e8 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeGen.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeGen.scala @@ -74,7 +74,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL { val extraFlags = if (inClass) PrivateLocal | SYNTHETIC else 0 val mval = ( - accessor.owner.newVariable(nme.moduleVarName(accessor.name), accessor.pos.focus, MODULEVAR | extraFlags) + accessor.owner.newVariable(nme.moduleVarName(accessor.name.toTermName), accessor.pos.focus, MODULEVAR | extraFlags) setInfo accessor.tpe.finalResultType addAnnotation VolatileAttr ) @@ -210,7 +210,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL { */ private def mkPackedValDef(expr: Tree, owner: Symbol, name: Name): (ValDef, () => Ident) = { val packedType = typer.packedType(expr, owner) - val sym = owner.newValue(name, expr.pos.makeTransparent, SYNTHETIC) setInfo packedType + val sym = owner.newValue(name.toTermName, expr.pos.makeTransparent, SYNTHETIC) setInfo packedType (ValDef(sym, expr), () => Ident(sym) setPos sym.pos.focus setType expr.tpe) } diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 9bb7e1c3df..679ef1a0c9 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -701,10 +701,10 @@ self => tree match { case Ident(name) => removeAsPlaceholder(name) - makeParam(name, TypeTree() setPos o2p(tree.pos.endOrPoint)) + makeParam(name.toTermName, TypeTree() setPos o2p(tree.pos.endOrPoint)) case Typed(Ident(name), tpe) if tpe.isType => // get the ident! removeAsPlaceholder(name) - makeParam(name, tpe) + makeParam(name.toTermName, tpe) case _ => syntaxError(tree.pos, "not a legal formal parameter", false) makeParam(nme.ERROR, errorTypeTree setPos o2p(tree.pos.endOrPoint)) @@ -783,7 +783,7 @@ self => val rPos = top.pos val end = if (rPos.isDefined) rPos.endOrPoint else opPos.endOrPoint top = atPos(start, opinfo.offset, end) { - makeBinop(isExpr, opinfo.operand, opinfo.operator, top, opPos) + makeBinop(isExpr, opinfo.operand, opinfo.operator.toTermName, top, opPos) } } top @@ -1306,7 +1306,7 @@ self => val cond = condExpr() newLinesOpt() val body = expr() - makeWhile(lname, cond, body) + makeWhile(lname.toTermName, cond, body) } } parseWhile @@ -1318,7 +1318,7 @@ self => if (isStatSep) in.nextToken() accept(WHILE) val cond = condExpr() - makeDoWhile(lname, body, cond) + makeDoWhile(lname.toTermName, body, cond) } } parseDo @@ -1477,7 +1477,7 @@ self => def prefixExpr(): Tree = { if (isUnaryOp) { atPos(in.offset) { - val name = nme.toUnaryName(rawIdent()) + val name = nme.toUnaryName(rawIdent().toTermName) if (name == nme.UNARY_- && isNumericLit) simpleExprRest(atPos(in.offset)(literal(isNegated = true)), canApply = true) else @@ -1515,7 +1515,7 @@ self => val pname = freshName("x$") in.nextToken() val id = atPos(start) (Ident(pname)) - val param = atPos(id.pos.focus){ makeSyntheticParam(pname) } + val param = atPos(id.pos.focus){ makeSyntheticParam(pname.toTermName) } placeholderParams = param :: placeholderParams id case LPAREN => @@ -2136,7 +2136,7 @@ self => expr() } else EmptyTree atPos(start, if (name == nme.ERROR) start else nameOffset) { - ValDef((mods | implicitmod | bynamemod) withAnnotations annots, name, tpt, default) + ValDef((mods | implicitmod | bynamemod) withAnnotations annots, name.toTermName, tpt, default) } } def paramClause(): List[ValDef] = { @@ -2696,7 +2696,7 @@ self => atPos(start, if (name == nme.ERROR) start else nameOffset) { val mods1 = if (in.token == SUBTYPE) mods | Flags.DEFERRED else mods val template = templateOpt(mods1, name, NoMods, Nil, tstart) - ModuleDef(mods1, name, template) + ModuleDef(mods1, name.toTermName, template) } } diff --git a/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala b/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala index fd4366baf1..5cc4404ca1 100644 --- a/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala +++ b/src/compiler/scala/tools/nsc/backend/JavaPlatform.scala @@ -42,13 +42,9 @@ trait JavaPlatform extends Platform { if (settings.make.isDefault) Nil else List(dependencyAnalysis) - private def classEmitPhase = - if (settings.target.value == "jvm-1.5-fjbg") genJVM - else genASM - def platformPhases = List( flatten, // get rid of inner classes - classEmitPhase // generate .class files + genASM // generate .class files ) ++ depAnalysisPhase lazy val externalEquals = getDecl(BoxesRunTimeClass, nme.equals_) diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index 603e1209a5..4e973c86ea 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -765,7 +765,7 @@ abstract class GenICode extends SubComponent { val cm = CALL_METHOD(sym, invokeStyle) /** In a couple cases, squirrel away a little extra information in the - * CALL_METHOD for use by GenJVM. + * CALL_METHOD for use by GenASM. */ fun match { case Select(qual, _) => @@ -1395,7 +1395,7 @@ abstract class GenICode extends SubComponent { */ def genEqEqPrimitive(l: Tree, r: Tree, ctx: Context)(thenCtx: Context, elseCtx: Context): Unit = { def getTempLocal = ctx.method.lookupLocal(nme.EQEQ_LOCAL_VAR) getOrElse { - ctx.makeLocal(l.pos, AnyRefClass.tpe, nme.EQEQ_LOCAL_VAR) + ctx.makeLocal(l.pos, AnyRefClass.tpe, nme.EQEQ_LOCAL_VAR.toString) } /** True if the equality comparison is between values that require the use of the rich equality diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala index d2e641cbf9..819178935b 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala @@ -190,7 +190,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { /* don't javaNameCache.clear() because that causes the following tests to fail: * test/files/run/macro-repl-dontexpand.scala * test/files/jvm/interpreter.scala - * TODO but why? what use could javaNameCache possibly see once GenJVM is over? + * TODO but why? what use could javaNameCache possibly see once GenASM is over? */ /* TODO After emitting all class files (e.g., in a separate compiler phase) ASM can perform bytecode verification: @@ -1198,7 +1198,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { /* Typestate: should be called before emitting fields (because it adds an IField to the current IClass). */ def addCreatorCode(block: BasicBlock) { val fieldSymbol = ( - clasz.symbol.newValue(newTermName(androidFieldName), NoPosition, Flags.STATIC | Flags.FINAL) + clasz.symbol.newValue(androidFieldName, NoPosition, Flags.STATIC | Flags.FINAL) setInfo AndroidCreatorClass.tpe ) val methodSymbol = definitions.getMember(clasz.symbol.companionModule, androidFieldName) @@ -1213,7 +1213,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { jclass.visitField( PublicStaticFinal, - androidFieldName, + androidFieldName.toString, tdesc_creator, null, // no java-generic-signature null // no initial value @@ -1233,7 +1233,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { clinit.visitMethodInsn( asm.Opcodes.INVOKEVIRTUAL, moduleName, - androidFieldName, + androidFieldName.toString, asm.Type.getMethodDescriptor(creatorType, Array.empty[asm.Type]: _*) ) @@ -1241,7 +1241,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { clinit.visitFieldInsn( asm.Opcodes.PUTSTATIC, thisName, - androidFieldName, + androidFieldName.toString, tdesc_creator ) } diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala deleted file mode 100644 index 72b7e35408..0000000000 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala +++ /dev/null @@ -1,62 +0,0 @@ -/* NSC -- new Scala compiler - * Copyright 2005-2013 LAMP/EPFL - * @author Stephane Micheloud - */ - - -package scala.tools.nsc -package backend.jvm - -import ch.epfl.lamp.fjbg._ -import symtab.Flags - -trait GenAndroid { - self: GenJVM => - - import global._ - import icodes._ - import opcodes._ - - /** From the reference documentation of the Android SDK: - * The `Parcelable` interface identifies classes whose instances can be - * written to and restored from a `Parcel`. Classes implementing the - * `Parcelable` interface must also have a static field called `CREATOR`, - * which is an object implementing the `Parcelable.Creator` interface. - */ - private val fieldName = newTermName("CREATOR") - - private lazy val AndroidParcelableInterface = rootMirror.getClassIfDefined("android.os.Parcelable") - private lazy val AndroidCreatorClass = rootMirror.getClassIfDefined("android.os.Parcelable$Creator") - - def isAndroidParcelableClass(sym: Symbol) = - (AndroidParcelableInterface != NoSymbol) && - (sym.parentSymbols contains AndroidParcelableInterface) - - def addCreatorCode(codegen: BytecodeGenerator, block: BasicBlock) { - import codegen._ - val fieldSymbol = ( - clasz.symbol.newValue(newTermName(fieldName), NoPosition, Flags.STATIC | Flags.FINAL) - setInfo AndroidCreatorClass.tpe - ) - val methodSymbol = definitions.getMember(clasz.symbol.companionModule, fieldName) - clasz addField new IField(fieldSymbol) - block emit CALL_METHOD(methodSymbol, Static(false)) - block emit STORE_FIELD(fieldSymbol, true) - } - - def legacyAddCreatorCode(codegen: BytecodeGenerator, clinit: JExtendedCode) { - import codegen._ - val creatorType = javaType(AndroidCreatorClass) - jclass.addNewField(PublicStaticFinal, - fieldName, - creatorType) - val moduleName = javaName(clasz.symbol)+"$" - clinit.emitGETSTATIC(moduleName, - nme.MODULE_INSTANCE_FIELD.toString, - new JObjectType(moduleName)) - clinit.emitINVOKEVIRTUAL(moduleName, fieldName, - new JMethodType(creatorType, Array())) - clinit.emitPUTSTATIC(jclass.getName(), fieldName, creatorType) - } - -} diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala deleted file mode 100644 index e1484d1f97..0000000000 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ /dev/null @@ -1,1950 +0,0 @@ -/* NSC -- new Scala compiler - * Copyright 2005-2013 LAMP/EPFL - * @author Iulian Dragos - */ - -package scala.tools.nsc -package backend.jvm - -import java.nio.ByteBuffer -import scala.collection.{ mutable, immutable } -import scala.reflect.internal.pickling.{ PickleFormat, PickleBuffer } -import scala.tools.nsc.symtab._ -import scala.reflect.internal.util.{ SourceFile, NoSourceFile } -import scala.reflect.internal.ClassfileConstants._ -import ch.epfl.lamp.fjbg._ -import JAccessFlags._ -import JObjectType.{ JAVA_LANG_STRING, JAVA_LANG_OBJECT } -import scala.language.postfixOps - -/** This class ... - * - * @author Iulian Dragos - * @version 1.0 - * - */ -abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with BytecodeWriters { - import global._ - import icodes._ - import icodes.opcodes._ - import definitions._ - - val phaseName = "jvm" - - /** Create a new phase */ - override def newPhase(p: Phase): Phase = new JvmPhase(p) - - /** JVM code generation phase - */ - class JvmPhase(prev: Phase) extends ICodePhase(prev) { - def name = phaseName - override def erasedTypes = true - def apply(cls: IClass) = sys.error("no implementation") - - def isJavaEntryPoint(clasz: IClass) = { - val sym = clasz.symbol - def fail(msg: String, pos: Position = sym.pos) = { - clasz.cunit.warning(sym.pos, - sym.name + " has a main method with parameter type Array[String], but " + sym.fullName('.') + " will not be a runnable program.\n" + - " Reason: " + msg - // TODO: make this next claim true, if possible - // by generating valid main methods as static in module classes - // not sure what the jvm allows here - // + " You can still run the program by calling it as " + sym.javaSimpleName + " instead." - ) - false - } - def failNoForwarder(msg: String) = { - fail(msg + ", which means no static forwarder can be generated.\n") - } - val possibles = if (sym.hasModuleFlag) (sym.tpe nonPrivateMember nme.main).alternatives else Nil - val hasApproximate = possibles exists { m => - m.info match { - case MethodType(p :: Nil, _) => p.tpe.typeSymbol == ArrayClass - case _ => false - } - } - // At this point it's a module with a main-looking method, so either - // succeed or warn that it isn't. - hasApproximate && { - // Before erasure so we can identify generic mains. - enteringErasure { - val companion = sym.linkedClassOfClass - - if (hasJavaMainMethod(companion)) - failNoForwarder("companion contains its own main method") - else if (companion.tpe.member(nme.main) != NoSymbol) - // this is only because forwarders aren't smart enough yet - failNoForwarder("companion contains its own main method (implementation restriction: no main is allowed, regardless of signature)") - else if (companion.isTrait) - failNoForwarder("companion is a trait") - // Now either succeeed, or issue some additional warnings for things which look like - // attempts to be java main methods. - else possibles exists { m => - m.info match { - case PolyType(_, _) => - fail("main methods cannot be generic.") - case MethodType(params, res) => - if (res.typeSymbol :: params exists (_.isAbstractType)) - fail("main methods cannot refer to type parameters or abstract types.", m.pos) - else - isJavaMainMethod(m) || fail("main method must have exact signature (Array[String])Unit", m.pos) - case tp => - fail("don't know what this is: " + tp, m.pos) - } - } - } - } - } - - override def run() { - // we reinstantiate the bytecode generator at each run, to allow the GC - // to collect everything - if (settings.debug.value) - inform("[running phase " + name + " on icode]") - - if (settings.Xdce.value) - for ((sym, cls) <- icodes.classes if inliner.isClosureClass(sym) && !deadCode.liveClosures(sym)) { - log(s"Optimizer eliminated ${sym.fullNameString}") - icodes.classes -= sym - } - - // For predictably ordered error messages. - val sortedClasses = classes.values.toList sortBy ("" + _.symbol.fullName) - val entryPoints = sortedClasses filter isJavaEntryPoint - - val bytecodeWriter = settings.outputDirs.getSingleOutput match { - case Some(f) if f hasExtension "jar" => - // If no main class was specified, see if there's only one - // entry point among the classes going into the jar. - if (settings.mainClass.isDefault) { - entryPoints map (_.symbol fullName '.') match { - case Nil => - log("No Main-Class designated or discovered.") - case name :: Nil => - log("Unique entry point: setting Main-Class to " + name) - settings.mainClass.value = name - case names => - log("No Main-Class due to multiple entry points:\n " + names.mkString("\n ")) - } - } - else log("Main-Class was specified: " + settings.mainClass.value) - - new DirectToJarfileWriter(f.file) - - case _ => - if (settings.Ygenjavap.isDefault) { - if(settings.Ydumpclasses.isDefault) - new ClassBytecodeWriter { } - else - new ClassBytecodeWriter with DumpBytecodeWriter { } - } - else new ClassBytecodeWriter with JavapBytecodeWriter { } - } - - val codeGenerator = new BytecodeGenerator(bytecodeWriter) - debuglog("Created new bytecode generator for " + classes.size + " classes.") - - sortedClasses foreach { c => - try codeGenerator.genClass(c) - catch { - case e: JCode.CodeSizeTooBigException => - log("Skipped class %s because it has methods that are too long.".format(c)) - } - } - - bytecodeWriter.close() - classes.clear() - } - } - - var pickledBytes = 0 // statistics - - /** - * Java bytecode generator. - * - */ - class BytecodeGenerator(bytecodeWriter: BytecodeWriter) extends BytecodeUtil { - def this() = this(new ClassBytecodeWriter { }) - def debugLevel = settings.debuginfo.indexOfChoice - import bytecodeWriter.writeClass - - val MIN_SWITCH_DENSITY = 0.7 - val INNER_CLASSES_FLAGS = - (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED | ACC_STATIC | ACC_INTERFACE | ACC_ABSTRACT) - - val PublicStatic = ACC_PUBLIC | ACC_STATIC - val PublicStaticFinal = ACC_PUBLIC | ACC_STATIC | ACC_FINAL - - val StringBuilderClassName = javaName(definitions.StringBuilderClass) - val BoxesRunTime = "scala.runtime.BoxesRunTime" - - val StringBuilderType = new JObjectType(StringBuilderClassName) // TODO use ASMType.getObjectType - val toStringType = new JMethodType(JAVA_LANG_STRING, JType.EMPTY_ARRAY) // TODO use ASMType.getMethodType - val arrayCloneType = new JMethodType(JAVA_LANG_OBJECT, JType.EMPTY_ARRAY) - - // Scala attributes - val BeanInfoAttr = rootMirror.getRequiredClass("scala.beans.BeanInfo") - - final val ExcludedForwarderFlags = { - import Flags._ - // Should include DEFERRED but this breaks findMember. - ( CASE | SPECIALIZED | LIFTED | PROTECTED | STATIC | EXPANDEDNAME | BridgeAndPrivateFlags ) - } - - // Additional interface parents based on annotations and other cues - def newParentForAttr(attr: Symbol): Option[Symbol] = attr match { - case CloneableAttr => Some(JavaCloneableClass) - case RemoteAttr => Some(RemoteInterfaceClass) - case _ => None - } - - val versionPickle = { - val vp = new PickleBuffer(new Array[Byte](16), -1, 0) - assert(vp.writeIndex == 0, vp) - vp writeNat PickleFormat.MajorVersion - vp writeNat PickleFormat.MinorVersion - vp writeNat 0 - vp - } - - private def helperBoxTo(kind: ValueTypeKind): Tuple2[String, JMethodType] = { - val boxedType = definitions.boxedClass(kind.toType.typeSymbol) - val mtype = new JMethodType(javaType(boxedType), Array(javaType(kind))) - - Pair("boxTo" + boxedType.decodedName, mtype) - } - - private val jBoxTo: Map[TypeKind, Tuple2[String, JMethodType]] = Map( - BOOL -> helperBoxTo(BOOL) , - BYTE -> helperBoxTo(BYTE) , - CHAR -> helperBoxTo(CHAR) , - SHORT -> helperBoxTo(SHORT) , - INT -> helperBoxTo(INT) , - LONG -> helperBoxTo(LONG) , - FLOAT -> helperBoxTo(FLOAT) , - DOUBLE -> helperBoxTo(DOUBLE) - ) - - private def helperUnboxTo(kind: ValueTypeKind): Tuple2[String, JMethodType] = { - val mtype = new JMethodType(javaType(kind), Array(JAVA_LANG_OBJECT)) - val mname = "unboxTo" + kind.toType.typeSymbol.decodedName - - Pair(mname, mtype) - } - - private val jUnboxTo: Map[TypeKind, Tuple2[String, JMethodType]] = Map( - BOOL -> helperUnboxTo(BOOL) , - BYTE -> helperUnboxTo(BYTE) , - CHAR -> helperUnboxTo(CHAR) , - SHORT -> helperUnboxTo(SHORT) , - INT -> helperUnboxTo(INT) , - LONG -> helperUnboxTo(LONG) , - FLOAT -> helperUnboxTo(FLOAT) , - DOUBLE -> helperUnboxTo(DOUBLE) - ) - - var clasz: IClass = _ - var method: IMethod = _ - var jclass: JClass = _ - var jmethod: JMethod = _ - - def isParcelableClass = isAndroidParcelableClass(clasz.symbol) - def isRemoteClass = clasz.symbol hasAnnotation RemoteAttr - def serialVUID = clasz.symbol getAnnotation SerialVersionUIDAttr collect { - case AnnotationInfo(_, Literal(const) :: _, _) => const.longValue - } - - val fjbgContext = new FJBGContext(49, 0) - val emitVars = debugLevel >= 3 - - // bug had phase with wrong name; leaving enabled for brief pseudo deprecation - private val checkSignatures = ( - (settings.check containsName phaseName) - || (settings.check.value contains "genjvm") && { - global.warning("This option will be removed: please use -Ycheck:%s, not -Ycheck:genjvm." format phaseName) - true - } - ) - - /** For given symbol return a symbol corresponding to a class that should be declared as inner class. - * - * For example: - * class A { - * class B - * object C - * } - * - * then method will return NoSymbol for A, the same symbol for A.B (corresponding to A$B class) and A$C$ symbol - * for A.C. - */ - private def innerClassSymbolFor(s: Symbol): Symbol = - if (s.isClass) s else if (s.isModule) s.moduleClass else NoSymbol - - override def javaName(sym: Symbol): String = { // TODO Miguel says: check whether a single pass over `icodes.classes` can populate `innerClassBuffer` faster. - /** - * Checks if given symbol corresponds to inner class/object and add it to innerClassBuffer - * - * Note: This method is called recursively thus making sure that we add complete chain - * of inner class all until root class. - */ - def collectInnerClass(s: Symbol): Unit = { - // TODO: some enteringFlatten { ... } which accounts for - // being nested in parameterized classes (if we're going to selectively flatten.) - val x = innerClassSymbolFor(s) - if(x ne NoSymbol) { - assert(x.isClass, "not an inner-class symbol") - val isInner = !x.rawowner.isPackageClass - if (isInner) { - innerClassBuffer += x - collectInnerClass(x.rawowner) - } - } - } - collectInnerClass(sym) - - super.javaName(sym) - } - - /** Write a class to disk, adding the Scala signature (pickled type - * information) and inner classes. - * - * @param jclass The FJBG class, where code was emitted - * @param sym The corresponding symbol, used for looking up pickled information - */ - def emitClass(jclass: JClass, sym: Symbol) { - addInnerClasses(jclass) - writeClass("" + sym.name, jclass.getName(), toByteArray(jclass), sym) - } - - /** Returns the ScalaSignature annotation if it must be added to this class, - * none otherwise; furthermore, it adds to `jclass` the ScalaSig marker - * attribute (marking that a scala signature annotation is present) or the - * Scala marker attribute (marking that the signature for this class is in - * another file). The annotation that is returned by this method must be - * added to the class' annotations list when generating them. - * - * @param jclass The class file that is being readied. - * @param sym The symbol for which the signature has been entered in - * the symData map. This is different than the symbol - * that is being generated in the case of a mirror class. - * @return An option that is: - * - defined and contains an annotation info of the - * ScalaSignature type, instantiated with the pickle - * signature for sym (a ScalaSig marker attribute has - * been written); - * - undefined if the jclass/sym couple must not contain a - * signature (a Scala marker attribute has been written). - */ - def scalaSignatureAddingMarker(jclass: JClass, sym: Symbol): Option[AnnotationInfo] = - currentRun.symData get sym match { - case Some(pickle) if !nme.isModuleName(newTermName(jclass.getName)) => - val scalaAttr = - fjbgContext.JOtherAttribute(jclass, jclass, tpnme.ScalaSignatureATTR.toString, - versionPickle.bytes, versionPickle.writeIndex) - jclass addAttribute scalaAttr - val scalaAnnot = { - val sigBytes = ScalaSigBytes(pickle.bytes.take(pickle.writeIndex)) - AnnotationInfo(sigBytes.sigAnnot, Nil, List((nme.bytes, sigBytes))) - } - pickledBytes += pickle.writeIndex - currentRun.symData -= sym - currentRun.symData -= sym.companionSymbol - Some(scalaAnnot) - case _ => - val markerAttr = - fjbgContext.JOtherAttribute(jclass, jclass, tpnme.ScalaATTR.toString, new Array[Byte](0), 0) - jclass addAttribute markerAttr - None - } - - private var innerClassBuffer = mutable.LinkedHashSet[Symbol]() - - /** Drop redundant interfaces (ones which are implemented by some other parent) from the immediate parents. - * This is important on Android because there is otherwise an interface explosion. - */ - private def minimizeInterfaces(interfaces: List[Symbol]): List[Symbol] = { - var rest = interfaces - var leaves = List.empty[Symbol] - while(!rest.isEmpty) { - val candidate = rest.head - val nonLeaf = leaves exists { lsym => lsym isSubClass candidate } - if(!nonLeaf) { - leaves = candidate :: (leaves filterNot { lsym => candidate isSubClass lsym }) - } - rest = rest.tail - } - - leaves - } - - def genClass(c: IClass) { - clasz = c - innerClassBuffer.clear() - - val name = javaName(c.symbol) - - val ps = c.symbol.info.parents - - val superClass: Symbol = if(ps.isEmpty) ObjectClass else ps.head.typeSymbol; - - val superInterfaces0: List[Symbol] = if(ps.isEmpty) Nil else c.symbol.mixinClasses; - val superInterfaces = superInterfaces0 ++ c.symbol.annotations.flatMap(ann => newParentForAttr(ann.symbol)) distinct - - val ifaces = - if(superInterfaces.isEmpty) JClass.NO_INTERFACES - else mkArray(minimizeInterfaces(superInterfaces) map javaName) - - jclass = fjbgContext.JClass(javaFlags(c.symbol), - name, - javaName(superClass), - ifaces, - c.cunit.source.toString) - - if (isStaticModule(c.symbol) || serialVUID != None || isParcelableClass) { - if (isStaticModule(c.symbol)) - addModuleInstanceField - addStaticInit(jclass, c.lookupStaticCtor) - - if (isTopLevelModule(c.symbol)) { - if (c.symbol.companionClass == NoSymbol) - generateMirrorClass(c.symbol, c.cunit.source) - else - log("No mirror class for module with linked class: " + - c.symbol.fullName) - } - } - else { - c.lookupStaticCtor foreach (constructor => addStaticInit(jclass, Some(constructor))) - - // it must be a top level class (name contains no $s) - def isCandidateForForwarders(sym: Symbol): Boolean = - exitingPickler { - !(sym.name.toString contains '$') && sym.hasModuleFlag && !sym.isImplClass && !sym.isNestedClass - } - - // At some point this started throwing lots of exceptions as a compile was finishing. - // error: java.lang.AssertionError: - // assertion failed: List(object package$CompositeThrowable, object package$CompositeThrowable) - // ...is the one I've seen repeatedly. Suppressing. - val lmoc = ( - try c.symbol.companionModule - catch { case x: AssertionError => - Console.println("Suppressing failed assert: " + x) - NoSymbol - } - ) - // add static forwarders if there are no name conflicts; see bugs #363 and #1735 - if (lmoc != NoSymbol && !c.symbol.isInterface) { - if (isCandidateForForwarders(lmoc) && !settings.noForwarders.value) { - log("Adding static forwarders from '%s' to implementations in '%s'".format(c.symbol, lmoc)) - addForwarders(jclass, lmoc.moduleClass) - } - } - } - - clasz.fields foreach genField - clasz.methods foreach genMethod - - val ssa = scalaSignatureAddingMarker(jclass, c.symbol) - addGenericSignature(jclass, c.symbol, c.symbol.owner) - addAnnotations(jclass, c.symbol.annotations ++ ssa) - addEnclosingMethodAttribute(jclass, c.symbol) - emitClass(jclass, c.symbol) - - if (c.symbol hasAnnotation BeanInfoAttr) - genBeanInfoClass(c) - } - - private def addEnclosingMethodAttribute(jclass: JClass, clazz: Symbol) { - val sym = clazz.originalEnclosingMethod - if (sym.isMethod) { - debuglog("enclosing method for %s is %s (in %s)".format(clazz, sym, sym.enclClass)) - jclass addAttribute fjbgContext.JEnclosingMethodAttribute( - jclass, - javaName(sym.enclClass), - javaName(sym), - javaType(sym) - ) - } else if (clazz.isAnonymousClass) { - val enclClass = clazz.rawowner - assert(enclClass.isClass, enclClass) - val sym = enclClass.primaryConstructor - if (sym == NoSymbol) - log("Ran out of room looking for an enclosing method for %s: no constructor here.".format( - enclClass, clazz) - ) - else { - debuglog("enclosing method for %s is %s (in %s)".format(clazz, sym, enclClass)) - jclass addAttribute fjbgContext.JEnclosingMethodAttribute( - jclass, - javaName(enclClass), - javaName(sym), - javaType(sym).asInstanceOf[JMethodType] - ) - } - } - } - - private def toByteArray(jc: JClass): Array[Byte] = { - val bos = new java.io.ByteArrayOutputStream() - val dos = new java.io.DataOutputStream(bos) - jc.writeTo(dos) - dos.close() - bos.toByteArray - } - - /** - * Generate a bean info class that describes the given class. - * - * @author Ross Judson (ross.judson@soletta.com) - */ - def genBeanInfoClass(c: IClass) { - val beanInfoClass = fjbgContext.JClass(javaFlags(c.symbol), - javaName(c.symbol) + "BeanInfo", - "scala/beans/ScalaBeanInfo", - JClass.NO_INTERFACES, - c.cunit.source.toString) - - var fieldList = List[String]() - for (f <- clasz.fields if f.symbol.hasGetter; - g = f.symbol.getter(c.symbol); - s = f.symbol.setter(c.symbol); - if g.isPublic && !(f.symbol.name startsWith "$")) // inserting $outer breaks the bean - fieldList = javaName(f.symbol) :: javaName(g) :: (if (s != NoSymbol) javaName(s) else null) :: fieldList - val methodList = - for (m <- clasz.methods - if !m.symbol.isConstructor && - m.symbol.isPublic && - !(m.symbol.name startsWith "$") && - !m.symbol.isGetter && - !m.symbol.isSetter) yield javaName(m.symbol) - - val constructor = beanInfoClass.addNewMethod(ACC_PUBLIC, "<init>", JType.VOID, new Array[JType](0), new Array[String](0)) - val jcode = constructor.getCode().asInstanceOf[JExtendedCode] - val strKind = new JObjectType(javaName(StringClass)) - val stringArrayKind = new JArrayType(strKind) - val conType = new JMethodType(JType.VOID, Array(javaType(ClassClass), stringArrayKind, stringArrayKind)) - - def push(lst:Seq[String]) { - var fi = 0 - for (f <- lst) { - jcode.emitDUP() - jcode emitPUSH fi - if (f != null) - jcode emitPUSH f - else - jcode.emitACONST_NULL() - jcode emitASTORE strKind - fi += 1 - } - } - - jcode.emitALOAD_0() - // push the class - jcode emitPUSH javaType(c.symbol).asInstanceOf[JReferenceType] - - // push the string array of field information - jcode emitPUSH fieldList.length - jcode emitANEWARRAY strKind - push(fieldList) - - // push the string array of method information - jcode emitPUSH methodList.length - jcode emitANEWARRAY strKind - push(methodList) - - // invoke the superclass constructor, which will do the - // necessary java reflection and create Method objects. - jcode.emitINVOKESPECIAL("scala/beans/ScalaBeanInfo", "<init>", conType) - jcode.emitRETURN() - - // write the bean information class file. - writeClass("BeanInfo ", beanInfoClass.getName(), toByteArray(beanInfoClass), c.symbol) - } - - /** Add the given 'throws' attributes to jmethod */ - def addExceptionsAttribute(jmethod: JMethod, excs: List[AnnotationInfo]) { - if (excs.isEmpty) return - - val cpool = jmethod.getConstantPool - val buf: ByteBuffer = ByteBuffer.allocate(512) - var nattr = 0 - - // put some random value; the actual number is determined at the end - buf putShort 0xbaba.toShort - - for (ThrownException(exc) <- excs.distinct) { - buf.putShort( - cpool.addClass( - javaName(exc)).shortValue) - nattr += 1 - } - - assert(nattr > 0, nattr) - buf.putShort(0, nattr.toShort) - addAttribute(jmethod, tpnme.ExceptionsATTR, buf) - } - - /** Whether an annotation should be emitted as a Java annotation - * .initialize: if 'annot' is read from pickle, atp might be un-initialized - */ - private def shouldEmitAnnotation(annot: AnnotationInfo) = - annot.symbol.initialize.isJavaDefined && - annot.matches(ClassfileAnnotationClass) && - annot.args.isEmpty - - private def emitJavaAnnotations(cpool: JConstantPool, buf: ByteBuffer, annotations: List[AnnotationInfo]): Int = { - def emitArgument(arg: ClassfileAnnotArg): Unit = arg match { - case LiteralAnnotArg(const) => - const.tag match { - case BooleanTag => - buf put 'Z'.toByte - buf putShort cpool.addInteger(if(const.booleanValue) 1 else 0).toShort - case ByteTag => - buf put 'B'.toByte - buf putShort cpool.addInteger(const.byteValue).toShort - case ShortTag => - buf put 'S'.toByte - buf putShort cpool.addInteger(const.shortValue).toShort - case CharTag => - buf put 'C'.toByte - buf putShort cpool.addInteger(const.charValue).toShort - case IntTag => - buf put 'I'.toByte - buf putShort cpool.addInteger(const.intValue).toShort - case LongTag => - buf put 'J'.toByte - buf putShort cpool.addLong(const.longValue).toShort - case FloatTag => - buf put 'F'.toByte - buf putShort cpool.addFloat(const.floatValue).toShort - case DoubleTag => - buf put 'D'.toByte - buf putShort cpool.addDouble(const.doubleValue).toShort - case StringTag => - buf put 's'.toByte - buf putShort cpool.addUtf8(const.stringValue).toShort - case ClazzTag => - buf put 'c'.toByte - buf putShort cpool.addUtf8(javaType(const.typeValue).getSignature()).toShort - case EnumTag => - buf put 'e'.toByte - buf putShort cpool.addUtf8(javaType(const.tpe).getSignature()).toShort - buf putShort cpool.addUtf8(const.symbolValue.name.toString).toShort - } - - case sb@ScalaSigBytes(bytes) if !sb.isLong => - buf put 's'.toByte - buf putShort cpool.addUtf8(sb.encodedBytes).toShort - - case sb@ScalaSigBytes(bytes) if sb.isLong => - buf put '['.toByte - val stringCount = (sb.encodedBytes.length / 65534) + 1 - buf putShort stringCount.toShort - for (i <- 0 until stringCount) { - buf put 's'.toByte - val j = i * 65535 - val string = sb.encodedBytes.slice(j, j + 65535) - buf putShort cpool.addUtf8(string).toShort - } - - case ArrayAnnotArg(args) => - buf put '['.toByte - buf putShort args.length.toShort - args foreach emitArgument - - case NestedAnnotArg(annInfo) => - buf put '@'.toByte - emitAnnotation(annInfo) - } - - def emitAnnotation(annotInfo: AnnotationInfo) { - val AnnotationInfo(typ, args, assocs) = annotInfo - val jtype = javaType(typ) - buf putShort cpool.addUtf8(jtype.getSignature()).toShort - assert(args.isEmpty, args) - buf putShort assocs.length.toShort - for ((name, value) <- assocs) { - buf putShort cpool.addUtf8(name.toString).toShort - emitArgument(value) - } - } - - var nannots = 0 - val pos = buf.position() - - // put some random value; the actual number of annotations is determined at the end - buf putShort 0xbaba.toShort - - for (annot <- annotations if shouldEmitAnnotation(annot)) { - nannots += 1 - emitAnnotation(annot) - } - - // save the number of annotations - buf.putShort(pos, nannots.toShort) - nannots - } - - // @M don't generate java generics sigs for (members of) implementation - // classes, as they are monomorphic (TODO: ok?) - private def needsGenericSignature(sym: Symbol) = !( - // PP: This condition used to include sym.hasExpandedName, but this leads - // to the total loss of generic information if a private member is - // accessed from a closure: both the field and the accessor were generated - // without it. This is particularly bad because the availability of - // generic information could disappear as a consequence of a seemingly - // unrelated change. - settings.Ynogenericsig.value - || sym.isArtifact - || sym.isLiftedMethod - || sym.isBridge - || (sym.ownerChain exists (_.isImplClass)) - ) - def addGenericSignature(jmember: JMember, sym: Symbol, owner: Symbol) { - if (needsGenericSignature(sym)) { - val memberTpe = enteringErasure(owner.thisType.memberInfo(sym)) - - erasure.javaSig(sym, memberTpe) foreach { sig => - // This seems useful enough in the general case. - log(sig) - if (checkSignatures) { - val normalizedTpe = enteringErasure(erasure.prepareSigMap(memberTpe)) - val bytecodeTpe = owner.thisType.memberInfo(sym) - if (!sym.isType && !sym.isConstructor && !(erasure.erasure(sym)(normalizedTpe) =:= bytecodeTpe)) { - clasz.cunit.warning(sym.pos, - """|compiler bug: created generic signature for %s in %s that does not conform to its erasure - |signature: %s - |original type: %s - |normalized type: %s - |erasure type: %s - |if this is reproducible, please report bug at https://issues.scala-lang.org/ - """.trim.stripMargin.format(sym, sym.owner.skipPackageObject.fullName, sig, memberTpe, normalizedTpe, bytecodeTpe)) - return - } - } - val index = jmember.getConstantPool.addUtf8(sig).toShort - if (settings.verbose.value && settings.debug.value) - enteringErasure(println("add generic sig "+sym+":"+sym.info+" ==> "+sig+" @ "+index)) - - val buf = ByteBuffer.allocate(2) - buf putShort index - addAttribute(jmember, tpnme.SignatureATTR, buf) - } - } - } - - def addAnnotations(jmember: JMember, annotations: List[AnnotationInfo]) { - if (annotations exists (_ matches definitions.DeprecatedAttr)) { - val attr = jmember.getContext().JOtherAttribute( - jmember.getJClass(), jmember, tpnme.DeprecatedATTR.toString, - new Array[Byte](0), 0) - jmember addAttribute attr - } - - val toEmit = annotations filter shouldEmitAnnotation - if (toEmit.isEmpty) return - - val buf: ByteBuffer = ByteBuffer.allocate(2048) - emitJavaAnnotations(jmember.getConstantPool, buf, toEmit) - addAttribute(jmember, tpnme.RuntimeAnnotationATTR, buf) - } - - def addParamAnnotations(jmethod: JMethod, pannotss: List[List[AnnotationInfo]]) { - val annotations = pannotss map (_ filter shouldEmitAnnotation) - if (annotations forall (_.isEmpty)) return - - val buf: ByteBuffer = ByteBuffer.allocate(2048) - - // number of parameters - buf.put(annotations.length.toByte) - for (annots <- annotations) - emitJavaAnnotations(jmethod.getConstantPool, buf, annots) - - addAttribute(jmethod, tpnme.RuntimeParamAnnotationATTR, buf) - } - - def addAttribute(jmember: JMember, name: Name, buf: ByteBuffer) { - if (buf.position() < 2) - return - - val length = buf.position() - val arr = buf.array().slice(0, length) - - val attr = jmember.getContext().JOtherAttribute(jmember.getJClass(), - jmember, - name.toString, - arr, - length) - jmember addAttribute attr - } - - def addInnerClasses(jclass: JClass) { - /** The outer name for this inner class. Note that it returns null - * when the inner class should not get an index in the constant pool. - * That means non-member classes (anonymous). See Section 4.7.5 in the JVMS. - */ - def outerName(innerSym: Symbol): String = { - if (innerSym.originalEnclosingMethod != NoSymbol) - null - else { - val outerName = javaName(innerSym.rawowner) - if (isTopLevelModule(innerSym.rawowner)) "" + nme.stripModuleSuffix(newTermName(outerName)) - else outerName - } - } - - def innerName(innerSym: Symbol): String = - if (innerSym.isAnonymousClass || innerSym.isAnonymousFunction) - null - else - innerSym.rawname + innerSym.moduleSuffix - - // add inner classes which might not have been referenced yet - exitingErasure { - for (sym <- List(clasz.symbol, clasz.symbol.linkedClassOfClass); m <- sym.info.decls.map(innerClassSymbolFor) if m.isClass) - innerClassBuffer += m - } - - val allInners = innerClassBuffer.toList - if (allInners.nonEmpty) { - debuglog(clasz.symbol.fullName('.') + " contains " + allInners.size + " inner classes.") - val innerClassesAttr = jclass.getInnerClasses() - // sort them so inner classes succeed their enclosing class - // to satisfy the Eclipse Java compiler - for (innerSym <- allInners sortBy (_.name.length)) { - val flags = { - val staticFlag = if (innerSym.rawowner.hasModuleFlag) ACC_STATIC else 0 - (javaFlags(innerSym) | staticFlag) & INNER_CLASSES_FLAGS - } - val jname = javaName(innerSym) - val oname = outerName(innerSym) - val iname = innerName(innerSym) - - // Mimicking javap inner class output - debuglog( - if (oname == null || iname == null) "//class " + jname - else "//%s=class %s of class %s".format(iname, jname, oname) - ) - - innerClassesAttr.addEntry(jname, oname, iname, flags) - } - } - } - - def genField(f: IField) { - debuglog("Adding field: " + f.symbol.fullName) - - val jfield = jclass.addNewField( - javaFieldFlags(f.symbol), - javaName(f.symbol), - javaType(f.symbol.tpe) - ) - - addGenericSignature(jfield, f.symbol, clasz.symbol) - addAnnotations(jfield, f.symbol.annotations) - } - - def genMethod(m: IMethod) { - if (m.symbol.isStaticConstructor || definitions.isGetClass(m.symbol)) return - - debuglog("Generating method " + m.symbol.fullName) - method = m - endPC.clear - computeLocalVarsIndex(m) - - var resTpe = javaType(m.symbol.tpe.resultType) - if (m.symbol.isClassConstructor) - resTpe = JType.VOID - - var flags = javaFlags(m.symbol) - if (jclass.isInterface) - flags |= ACC_ABSTRACT - - if (m.symbol.isStrictFP) - flags |= ACC_STRICT - - // native methods of objects are generated in mirror classes - if (method.native) - flags |= ACC_NATIVE - - jmethod = jclass.addNewMethod(flags, - javaName(m.symbol), - resTpe, - mkArray(m.params map (p => javaType(p.kind))), - mkArray(m.params map (p => javaName(p.sym)))) - - addRemoteException(jmethod, m.symbol) - - if (!jmethod.isAbstract() && !method.native) { - val jcode = jmethod.getCode().asInstanceOf[JExtendedCode] - - // add a fake local for debugging purposes - if (emitVars && isClosureApply(method.symbol)) { - val outerField = clasz.symbol.info.decl(nme.OUTER_LOCAL) - if (outerField != NoSymbol) { - log("Adding fake local to represent outer 'this' for closure " + clasz) - val _this = new Local( - method.symbol.newVariable(nme.FAKE_LOCAL_THIS), toTypeKind(outerField.tpe), false) - m.locals = m.locals ::: List(_this) - computeLocalVarsIndex(m) // since we added a new local, we need to recompute indexes - - jcode.emitALOAD_0() - jcode.emitGETFIELD(javaName(clasz.symbol), - javaName(outerField), - javaType(outerField)) - jcode.emitSTORE(indexOf(_this), javaType(_this.kind)) - } - } - - for (local <- m.locals if ! m.params.contains(local)) { - debuglog("add local var: " + local) - jmethod.addNewLocalVariable(javaType(local.kind), javaName(local.sym)) - } - - genCode(m) - if (emitVars) - genLocalVariableTable(m, jcode) - } - - addGenericSignature(jmethod, m.symbol, clasz.symbol) - val (excs, others) = m.symbol.annotations partition (_.symbol == ThrowsClass) - addExceptionsAttribute(jmethod, excs) - addAnnotations(jmethod, others) - addParamAnnotations(jmethod, m.params.map(_.sym.annotations)) - - // check for code size - try jmethod.freeze() - catch { - case e: JCode.CodeSizeTooBigException => - clasz.cunit.error(m.symbol.pos, "Code size exceeds JVM limits: %d".format(e.codeSize)) - throw e - } - } - - /** Adds a @remote annotation, actual use unknown. - */ - private def addRemoteException(jmethod: JMethod, meth: Symbol) { - val needsAnnotation = ( - (isRemoteClass || (meth hasAnnotation RemoteAttr) && jmethod.isPublic) - && !(meth.throwsAnnotations contains RemoteExceptionClass) - ) - if (needsAnnotation) { - val c = Constant(RemoteExceptionClass.tpe) - val arg = Literal(c) setType c.tpe - meth.addAnnotation(ThrowsClass, arg) - } - } - - private def isClosureApply(sym: Symbol): Boolean = { - (sym.name == nme.apply) && - sym.owner.isSynthetic && - sym.owner.tpe.parents.exists { t => - val TypeRef(_, sym, _) = t - FunctionClass contains sym - } - } - - def addModuleInstanceField() { - jclass.addNewField(PublicStaticFinal, - nme.MODULE_INSTANCE_FIELD.toString, - jclass.getType()) - } - - def addStaticInit(cls: JClass, mopt: Option[IMethod]) { - val clinitMethod = cls.addNewMethod(PublicStatic, - "<clinit>", - JType.VOID, - JType.EMPTY_ARRAY, - new Array[String](0)) - val clinit = clinitMethod.getCode().asInstanceOf[JExtendedCode] - - mopt match { - case Some(m) => - val oldLastBlock = m.lastBlock - val lastBlock = m.newBlock() - oldLastBlock.replaceInstruction(oldLastBlock.length - 1, JUMP(lastBlock)) - - if (isStaticModule(clasz.symbol)) { - // call object's private ctor from static ctor - lastBlock emit NEW(REFERENCE(m.symbol.enclClass)) - lastBlock emit CALL_METHOD(m.symbol.enclClass.primaryConstructor, Static(true)) - } - - // add serialVUID code - serialVUID foreach { value => - import Flags._, definitions._ - val fieldName = "serialVersionUID" - val fieldSymbol = clasz.symbol.newValue(newTermName(fieldName), NoPosition, STATIC | FINAL) setInfo LongClass.tpe - clasz addField new IField(fieldSymbol) - lastBlock emit CONSTANT(Constant(value)) - lastBlock emit STORE_FIELD(fieldSymbol, true) - } - - if (isParcelableClass) - addCreatorCode(BytecodeGenerator.this, lastBlock) - - lastBlock emit RETURN(UNIT) - lastBlock.close - - method = m - jmethod = clinitMethod - genCode(m) - case None => - legacyStaticInitializer(cls, clinit) - } - } - - private def legacyStaticInitializer(cls: JClass, clinit: JExtendedCode) { - if (isStaticModule(clasz.symbol)) { - clinit emitNEW cls.getName() - clinit.emitINVOKESPECIAL(cls.getName(), - JMethod.INSTANCE_CONSTRUCTOR_NAME, - JMethodType.ARGLESS_VOID_FUNCTION) - } - - serialVUID foreach { value => - val fieldName = "serialVersionUID" - jclass.addNewField(PublicStaticFinal, fieldName, JType.LONG) - clinit emitPUSH value - clinit.emitPUSH(value) - clinit.emitPUTSTATIC(jclass.getName(), fieldName, JType.LONG) - } - - if (isParcelableClass) - legacyAddCreatorCode(BytecodeGenerator.this, clinit) - - clinit.emitRETURN() - } - - /** Add a forwarder for method m */ - def addForwarder(jclass: JClass, module: Symbol, m: Symbol) { - val moduleName = javaName(module) - val methodInfo = module.thisType.memberInfo(m) - val paramJavaTypes = methodInfo.paramTypes map javaType - val paramNames = 0 until paramJavaTypes.length map ("x_" + _) - // TODO: evaluate the other flags we might be dropping on the floor here. - val flags = PublicStatic | ( - if (m.isVarargsMethod) ACC_VARARGS else 0 - ) - - /** Forwarders must not be marked final, as the JVM will not allow - * redefinition of a final static method, and we don't know what classes - * might be subclassing the companion class. See SI-4827. - */ - val mirrorMethod = jclass.addNewMethod( - flags, - javaName(m), - javaType(methodInfo.resultType), - mkArray(paramJavaTypes), - mkArray(paramNames)) - val mirrorCode = mirrorMethod.getCode().asInstanceOf[JExtendedCode] - mirrorCode.emitGETSTATIC(moduleName, - nme.MODULE_INSTANCE_FIELD.toString, - new JObjectType(moduleName)) - - var i = 0 - var index = 0 - val argTypes = mirrorMethod.getArgumentTypes() - while (i < argTypes.length) { - mirrorCode.emitLOAD(index, argTypes(i)) - index += argTypes(i).getSize() - i += 1 - } - - mirrorCode.emitINVOKEVIRTUAL(moduleName, mirrorMethod.getName, javaType(m).asInstanceOf[JMethodType]) - mirrorCode emitRETURN mirrorMethod.getReturnType() - - addRemoteException(mirrorMethod, m) - // only add generic signature if the method is concrete; bug #1745 - if (!m.isDeferred) - addGenericSignature(mirrorMethod, m, module) - - val (throws, others) = m.annotations partition (_.symbol == ThrowsClass) - addExceptionsAttribute(mirrorMethod, throws) - addAnnotations(mirrorMethod, others) - addParamAnnotations(mirrorMethod, m.info.params.map(_.annotations)) - } - - /** Add forwarders for all methods defined in `module` that don't conflict - * with methods in the companion class of `module`. A conflict arises when - * a method with the same name is defined both in a class and its companion - * object: method signature is not taken into account. - */ - def addForwarders(jclass: JClass, moduleClass: Symbol) { - assert(moduleClass.isModuleClass, moduleClass) - debuglog("Dumping mirror class for object: " + moduleClass) - - val className = jclass.getName - val linkedClass = moduleClass.companionClass - lazy val conflictingNames: Set[Name] = { - linkedClass.info.members collect { case sym if sym.name.isTermName => sym.name } toSet - } - debuglog("Potentially conflicting names for forwarders: " + conflictingNames) - - for (m <- moduleClass.info.membersBasedOnFlags(ExcludedForwarderFlags, Flags.METHOD)) { - if (m.isType || m.isDeferred || (m.owner eq ObjectClass) || m.isConstructor) - debuglog("No forwarder for '%s' from %s to '%s'".format(m, className, moduleClass)) - else if (conflictingNames(m.name)) - log("No forwarder for " + m + " due to conflict with " + linkedClass.info.member(m.name)) - else { - log("Adding static forwarder for '%s' from %s to '%s'".format(m, className, moduleClass)) - addForwarder(jclass, moduleClass, m) - } - } - } - - /** Generate a mirror class for a top-level module. A mirror class is a class - * containing only static methods that forward to the corresponding method - * on the MODULE instance of the given Scala object. It will only be - * generated if there is no companion class: if there is, an attempt will - * instead be made to add the forwarder methods to the companion class. - */ - def generateMirrorClass(clasz: Symbol, sourceFile: SourceFile) { - import JAccessFlags._ - /* We need to save inner classes buffer and create a new one to make sure - * that we do confuse inner classes of the class we mirror with inner - * classes of the class we are mirroring. These two sets can be different - * as seen in this case: - * - * class A { - * class B - * def b: B = new B - * } - * object C extends A - * - * Here mirror class of C has a static forwarder for (inherited) method `b` - * therefore it refers to class `B` and needs InnerClasses entry. However, - * the real class for `C` (named `C$`) is empty and does not refer to `B` - * thus does not need InnerClasses entry it. - * - * NOTE: This logic has been refactored in GenASM and everything is - * implemented in a much cleaner way by having two separate buffers. - */ - val savedInnerClasses = innerClassBuffer - innerClassBuffer = mutable.LinkedHashSet[Symbol]() - val moduleName = javaName(clasz) // + "$" - val mirrorName = moduleName.substring(0, moduleName.length() - 1) - val mirrorClass = fjbgContext.JClass(ACC_SUPER | ACC_PUBLIC | ACC_FINAL, - mirrorName, - JAVA_LANG_OBJECT.getName, - JClass.NO_INTERFACES, - "" + sourceFile) - - log("Dumping mirror class for '%s'".format(mirrorClass.getName)) - addForwarders(mirrorClass, clasz) - val ssa = scalaSignatureAddingMarker(mirrorClass, clasz.companionSymbol) - addAnnotations(mirrorClass, clasz.annotations ++ ssa) - emitClass(mirrorClass, clasz) - innerClassBuffer = savedInnerClasses - } - - var linearization: List[BasicBlock] = Nil - var isModuleInitialized = false - - def genCode(m: IMethod) { - val jcode = jmethod.getCode.asInstanceOf[JExtendedCode] - - def makeLabels(bs: List[BasicBlock]) = { - debuglog("Making labels for: " + method) - - mutable.HashMap(bs map (_ -> jcode.newLabel) : _*) - } - - isModuleInitialized = false - - linearization = linearizer.linearize(m) - val labels = makeLabels(linearization) - - var nextBlock: BasicBlock = linearization.head - - def genBlocks(l: List[BasicBlock]): Unit = l match { - case Nil => () - case x :: Nil => nextBlock = null; genBlock(x) - case x :: y :: ys => nextBlock = y; genBlock(x); genBlocks(y :: ys) - } - - /** Generate exception handlers for the current method. */ - def genExceptionHandlers() { - - /** Return a list of pairs of intervals where the handler is active. - * The intervals in the list have to be inclusive in the beginning and - * exclusive in the end: [start, end). - */ - def ranges(e: ExceptionHandler): List[(Int, Int)] = { - var covered = e.covered - var ranges: List[(Int, Int)] = Nil - var start = -1 - var end = -1 - - linearization foreach { b => - if (! (covered contains b) ) { - if (start >= 0) { // we're inside a handler range - end = labels(b).getAnchor() - ranges ::= ((start, end)) - start = -1 - } - } else { - if (start < 0) // we're not inside a handler range - start = labels(b).getAnchor() - - end = endPC(b) - covered -= b - } - } - - /* Add the last interval. Note that since the intervals are - * open-ended to the right, we have to give a number past the actual - * code! - */ - if (start >= 0) { - ranges ::= ((start, jcode.getPC())) - } - - if (!covered.isEmpty) - debuglog("Some covered blocks were not found in method: " + method + - " covered: " + covered + " not in " + linearization) - ranges - } - - for (e <- this.method.exh ; p <- ranges(e).sortBy(_._1)) { - if (p._1 < p._2) { - debuglog("Adding exception handler " + e + "at block: " + e.startBlock + " for " + method + - " from: " + p._1 + " to: " + p._2 + " catching: " + e.cls); - val cls = if (e.cls == NoSymbol || e.cls == ThrowableClass) null - else javaName(e.cls) - jcode.addExceptionHandler(p._1, p._2, - labels(e.startBlock).getAnchor(), - cls) - } else - log("Empty exception range: " + p) - } - } - - def isAccessibleFrom(target: Symbol, site: Symbol): Boolean = { - target.isPublic || target.isProtected && { - (site.enclClass isSubClass target.enclClass) || - (site.enclosingPackage == target.privateWithin) - } - } - - def genCallMethod(call: CALL_METHOD) { - val CALL_METHOD(method, style) = call - val siteSymbol = clasz.symbol - val hostSymbol = call.hostClass - val methodOwner = method.owner - // info calls so that types are up to date; erasure may add lateINTERFACE to traits - hostSymbol.info ; methodOwner.info - - def isInterfaceCall(sym: Symbol) = ( - sym.isInterface && methodOwner != ObjectClass - || sym.isJavaDefined && sym.isNonBottomSubClass(ClassfileAnnotationClass) - ) - // whether to reference the type of the receiver or - // the type of the method owner (if not an interface!) - val useMethodOwner = ( - style != Dynamic - || !isInterfaceCall(hostSymbol) && isAccessibleFrom(methodOwner, siteSymbol) - || hostSymbol.isBottomClass - ) - val receiver = if (useMethodOwner) methodOwner else hostSymbol - val jowner = javaName(receiver) - val jname = javaName(method) - val jtype = javaType(method).asInstanceOf[JMethodType] - - def dbg(invoke: String) { - debuglog("%s %s %s.%s:%s".format(invoke, receiver.accessString, jowner, jname, jtype)) - } - - def initModule() { - // we initialize the MODULE$ field immediately after the super ctor - if (isStaticModule(siteSymbol) && !isModuleInitialized && - jmethod.getName() == JMethod.INSTANCE_CONSTRUCTOR_NAME && - jname == JMethod.INSTANCE_CONSTRUCTOR_NAME) { - isModuleInitialized = true - jcode.emitALOAD_0() - jcode.emitPUTSTATIC(jclass.getName(), - nme.MODULE_INSTANCE_FIELD.toString, - jclass.getType()) - } - } - - style match { - case Static(true) => dbg("invokespecial"); jcode.emitINVOKESPECIAL(jowner, jname, jtype) - case Static(false) => dbg("invokestatic"); jcode.emitINVOKESTATIC(jowner, jname, jtype) - case Dynamic if isInterfaceCall(receiver) => dbg("invokinterface"); jcode.emitINVOKEINTERFACE(jowner, jname, jtype) - case Dynamic => dbg("invokevirtual"); jcode.emitINVOKEVIRTUAL(jowner, jname, jtype) - case SuperCall(_) => - dbg("invokespecial") - jcode.emitINVOKESPECIAL(jowner, jname, jtype) - initModule() - } - } - - def genBlock(b: BasicBlock) { - labels(b).anchorToNext() - - debuglog("Generating code for block: " + b + " at pc: " + labels(b).getAnchor()) - var lastMappedPC = 0 - var lastLineNr = 0 - var crtPC = 0 - - /** local variables whose scope appears in this block. */ - val varsInBlock: mutable.Set[Local] = new mutable.HashSet - val lastInstr = b.lastInstruction - - for (instr <- b) { - instr match { - case THIS(clasz) => jcode.emitALOAD_0() - - case CONSTANT(const) => genConstant(jcode, const) - - case LOAD_ARRAY_ITEM(kind) => - if(kind.isRefOrArrayType) { jcode.emitAALOAD() } - else { - (kind: @unchecked) match { - case UNIT => throw new IllegalArgumentException("invalid type for aload " + kind) - case BOOL | BYTE => jcode.emitBALOAD() - case SHORT => jcode.emitSALOAD() - case CHAR => jcode.emitCALOAD() - case INT => jcode.emitIALOAD() - case LONG => jcode.emitLALOAD() - case FLOAT => jcode.emitFALOAD() - case DOUBLE => jcode.emitDALOAD() - } - } - - case LOAD_LOCAL(local) => jcode.emitLOAD(indexOf(local), javaType(local.kind)) - - case lf @ LOAD_FIELD(field, isStatic) => - val owner = javaName(lf.hostClass) - debuglog("LOAD_FIELD with owner: " + owner + - " flags: " + field.owner.flagString) - val fieldJName = javaName(field) - val fieldJType = javaType(field) - if (isStatic) jcode.emitGETSTATIC(owner, fieldJName, fieldJType) - else jcode.emitGETFIELD( owner, fieldJName, fieldJType) - - case LOAD_MODULE(module) => - // assert(module.isModule, "Expected module: " + module) - debuglog("generating LOAD_MODULE for: " + module + " flags: " + module.flagString); - if (clasz.symbol == module.moduleClass && jmethod.getName() != nme.readResolve.toString) - jcode.emitALOAD_0() - else - jcode.emitGETSTATIC(javaName(module) /* + "$" */ , - nme.MODULE_INSTANCE_FIELD.toString, - javaType(module)) - - case STORE_ARRAY_ITEM(kind) => - if(kind.isRefOrArrayType) { jcode.emitAASTORE() } - else { - (kind: @unchecked) match { - case UNIT => throw new IllegalArgumentException("invalid type for astore " + kind) - case BOOL | BYTE => jcode.emitBASTORE() - case SHORT => jcode.emitSASTORE() - case CHAR => jcode.emitCASTORE() - case INT => jcode.emitIASTORE() - case LONG => jcode.emitLASTORE() - case FLOAT => jcode.emitFASTORE() - case DOUBLE => jcode.emitDASTORE() - } - } - - case STORE_LOCAL(local) => - jcode.emitSTORE(indexOf(local), javaType(local.kind)) - - case STORE_THIS(_) => - // this only works for impl classes because the self parameter comes first - // in the method signature. If that changes, this code has to be revisited. - jcode.emitASTORE_0() - - case STORE_FIELD(field, isStatic) => - val owner = javaName(field.owner) - val fieldJName = javaName(field) - val fieldJType = javaType(field) - if (isStatic) jcode.emitPUTSTATIC(owner, fieldJName, fieldJType) - else jcode.emitPUTFIELD( owner, fieldJName, fieldJType) - - case CALL_PRIMITIVE(primitive) => genPrimitive(primitive, instr.pos) - - /** Special handling to access native Array.clone() */ - case call @ CALL_METHOD(definitions.Array_clone, Dynamic) => - val target: String = javaType(call.targetTypeKind).getSignature() - jcode.emitINVOKEVIRTUAL(target, "clone", arrayCloneType) - - case call @ CALL_METHOD(method, style) => genCallMethod(call) - - case BOX(kind) => - val Pair(mname, mtype) = jBoxTo(kind) - jcode.emitINVOKESTATIC(BoxesRunTime, mname, mtype) - - case UNBOX(kind) => - val Pair(mname, mtype) = jUnboxTo(kind) - jcode.emitINVOKESTATIC(BoxesRunTime, mname, mtype) - - case NEW(REFERENCE(cls)) => - val className = javaName(cls) - jcode emitNEW className - - case CREATE_ARRAY(elem, 1) => - if(elem.isRefOrArrayType) { jcode emitANEWARRAY javaType(elem).asInstanceOf[JReferenceType] } - else { jcode emitNEWARRAY javaType(elem) } - - case CREATE_ARRAY(elem, dims) => - jcode.emitMULTIANEWARRAY(javaType(ArrayN(elem, dims)).asInstanceOf[JReferenceType], dims) - - case IS_INSTANCE(tpe) => - tpe match { - case REFERENCE(cls) => jcode emitINSTANCEOF new JObjectType(javaName(cls)) - case ARRAY(elem) => jcode emitINSTANCEOF new JArrayType(javaType(elem)) - case _ => abort("Unknown reference type in IS_INSTANCE: " + tpe) - } - - case CHECK_CAST(tpe) => - tpe match { - case REFERENCE(cls) => if (cls != ObjectClass) { jcode emitCHECKCAST new JObjectType(javaName(cls)) } // No need to checkcast for Objects - case ARRAY(elem) => jcode emitCHECKCAST new JArrayType(javaType(elem)) - case _ => abort("Unknown reference type in IS_INSTANCE: " + tpe) - } - - case SWITCH(tags, branches) => - val tagArray = new Array[Array[Int]](tags.length) - var caze = tags - var i = 0 - - while (i < tagArray.length) { - tagArray(i) = new Array[Int](caze.head.length) - caze.head.copyToArray(tagArray(i), 0) - i += 1 - caze = caze.tail - } - val branchArray = jcode.newLabels(tagArray.length) - i = 0 - while (i < branchArray.length) { - branchArray(i) = labels(branches(i)) - i += 1 - } - debuglog("Emitting SWITCH:\ntags: " + tags + "\nbranches: " + branches) - jcode.emitSWITCH(tagArray, - branchArray, - labels(branches.last), - MIN_SWITCH_DENSITY) - () - - case JUMP(whereto) => - if (nextBlock != whereto) - jcode.emitGOTO_maybe_W(labels(whereto), false) // default to short jumps - - case CJUMP(success, failure, cond, kind) => - if(kind.isIntSizedType) { // BOOL, BYTE, CHAR, SHORT, or INT - if (nextBlock == success) { - jcode.emitIF_ICMP(conds(cond.negate()), labels(failure)) - // .. and fall through to success label - } else { - jcode.emitIF_ICMP(conds(cond), labels(success)) - if (nextBlock != failure) - jcode.emitGOTO_maybe_W(labels(failure), false) - } - } else if(kind.isRefOrArrayType) { // REFERENCE(_) | ARRAY(_) - if (nextBlock == success) { - jcode.emitIF_ACMP(conds(cond.negate()), labels(failure)) - // .. and fall through to success label - } else { - jcode.emitIF_ACMP(conds(cond), labels(success)) - if (nextBlock != failure) - jcode.emitGOTO_maybe_W(labels(failure), false) - } - } else { - (kind: @unchecked) match { - case LONG => jcode.emitLCMP() - case FLOAT => - if (cond == LT || cond == LE) jcode.emitFCMPG() - else jcode.emitFCMPL() - case DOUBLE => - if (cond == LT || cond == LE) jcode.emitDCMPG() - else jcode.emitDCMPL() - } - if (nextBlock == success) { - jcode.emitIF(conds(cond.negate()), labels(failure)) - // .. and fall through to success label - } else { - jcode.emitIF(conds(cond), labels(success)); - if (nextBlock != failure) - jcode.emitGOTO_maybe_W(labels(failure), false) - } - } - - case CZJUMP(success, failure, cond, kind) => - if(kind.isIntSizedType) { // BOOL, BYTE, CHAR, SHORT, or INT - if (nextBlock == success) { - jcode.emitIF(conds(cond.negate()), labels(failure)) - } else { - jcode.emitIF(conds(cond), labels(success)) - if (nextBlock != failure) - jcode.emitGOTO_maybe_W(labels(failure), false) - } - } else if(kind.isRefOrArrayType) { // REFERENCE(_) | ARRAY(_) - val Success = success - val Failure = failure - (cond, nextBlock) match { - case (EQ, Success) => jcode emitIFNONNULL labels(failure) - case (NE, Failure) => jcode emitIFNONNULL labels(success) - case (EQ, Failure) => jcode emitIFNULL labels(success) - case (NE, Success) => jcode emitIFNULL labels(failure) - case (EQ, _) => - jcode emitIFNULL labels(success) - jcode.emitGOTO_maybe_W(labels(failure), false) - case (NE, _) => - jcode emitIFNONNULL labels(success) - jcode.emitGOTO_maybe_W(labels(failure), false) - case _ => - } - } else { - (kind: @unchecked) match { - case LONG => - jcode.emitLCONST_0() - jcode.emitLCMP() - case FLOAT => - jcode.emitFCONST_0() - if (cond == LT || cond == LE) jcode.emitFCMPG() - else jcode.emitFCMPL() - case DOUBLE => - jcode.emitDCONST_0() - if (cond == LT || cond == LE) jcode.emitDCMPG() - else jcode.emitDCMPL() - } - if (nextBlock == success) { - jcode.emitIF(conds(cond.negate()), labels(failure)) - } else { - jcode.emitIF(conds(cond), labels(success)) - if (nextBlock != failure) - jcode.emitGOTO_maybe_W(labels(failure), false) - } - } - - case RETURN(kind) => jcode emitRETURN javaType(kind) - - case THROW(_) => jcode.emitATHROW() - - case DROP(kind) => - if(kind.isWideType) jcode.emitPOP2() - else jcode.emitPOP() - - case DUP(kind) => - if(kind.isWideType) jcode.emitDUP2() - else jcode.emitDUP() - - case MONITOR_ENTER() => jcode.emitMONITORENTER() - - case MONITOR_EXIT() => jcode.emitMONITOREXIT() - - case SCOPE_ENTER(lv) => - varsInBlock += lv - lv.start = jcode.getPC() - - case SCOPE_EXIT(lv) => - if (varsInBlock(lv)) { - lv.ranges = (lv.start, jcode.getPC()) :: lv.ranges - varsInBlock -= lv - } - else if (b.varsInScope(lv)) { - lv.ranges = (labels(b).getAnchor(), jcode.getPC()) :: lv.ranges - b.varsInScope -= lv - } - else dumpMethodAndAbort(method, "Illegal local var nesting") - - case LOAD_EXCEPTION(_) => - () - } - - crtPC = jcode.getPC() - - // assert(instr.pos.source.isEmpty || instr.pos.source.get == (clasz.cunit.source), "sources don't match") - // val crtLine = instr.pos.line.get(lastLineNr); - - val crtLine = try { - if (instr.pos == NoPosition) lastLineNr else (instr.pos).line // check NoPosition to avoid costly exception - } catch { - case _: UnsupportedOperationException => - log("Warning: wrong position in: " + method) - lastLineNr - } - - if (instr eq lastInstr) { endPC(b) = jcode.getPC() } - - //System.err.println("CRTLINE: " + instr.pos + " " + - // /* (if (instr.pos < clasz.cunit.source.content.length) clasz.cunit.source.content(instr.pos) else '*') + */ " " + crtLine); - - if (crtPC > lastMappedPC) { - jcode.completeLineNumber(lastMappedPC, crtPC, crtLine) - lastMappedPC = crtPC - lastLineNr = crtLine - } - } - - // local vars that survived this basic block - for (lv <- varsInBlock) { - lv.ranges = (lv.start, jcode.getPC()) :: lv.ranges - } - for (lv <- b.varsInScope) { - lv.ranges = (labels(b).getAnchor(), jcode.getPC()) :: lv.ranges - } - } - - def genPrimitive(primitive: Primitive, pos: Position) { - primitive match { - case Negation(kind) => - if(kind.isIntSizedType) { jcode.emitINEG() } - else { - kind match { - case LONG => jcode.emitLNEG() - case FLOAT => jcode.emitFNEG() - case DOUBLE => jcode.emitDNEG() - case _ => abort("Impossible to negate a " + kind) - } - } - - case Arithmetic(op, kind) => - op match { - case ADD => - if(kind.isIntSizedType) { jcode.emitIADD() } - else { - (kind: @unchecked) match { - case LONG => jcode.emitLADD() - case FLOAT => jcode.emitFADD() - case DOUBLE => jcode.emitDADD() - } - } - - case SUB => - if(kind.isIntSizedType) { jcode.emitISUB() } - else { - (kind: @unchecked) match { - case LONG => jcode.emitLSUB() - case FLOAT => jcode.emitFSUB() - case DOUBLE => jcode.emitDSUB() - } - } - - case MUL => - if(kind.isIntSizedType) { jcode.emitIMUL() } - else { - (kind: @unchecked) match { - case LONG => jcode.emitLMUL() - case FLOAT => jcode.emitFMUL() - case DOUBLE => jcode.emitDMUL() - } - } - - case DIV => - if(kind.isIntSizedType) { jcode.emitIDIV() } - else { - (kind: @unchecked) match { - case LONG => jcode.emitLDIV() - case FLOAT => jcode.emitFDIV() - case DOUBLE => jcode.emitDDIV() - } - } - - case REM => - if(kind.isIntSizedType) { jcode.emitIREM() } - else { - (kind: @unchecked) match { - case LONG => jcode.emitLREM() - case FLOAT => jcode.emitFREM() - case DOUBLE => jcode.emitDREM() - } - } - - case NOT => - if(kind.isIntSizedType) { - jcode.emitPUSH(-1) - jcode.emitIXOR() - } else if(kind == LONG) { - jcode.emitPUSH(-1l) - jcode.emitLXOR() - } else { - abort("Impossible to negate an " + kind) - } - - case _ => - abort("Unknown arithmetic primitive " + primitive) - } - - case Logical(op, kind) => ((op, kind): @unchecked) match { - case (AND, LONG) => jcode.emitLAND() - case (AND, INT) => jcode.emitIAND() - case (AND, _) => - jcode.emitIAND() - if (kind != BOOL) - jcode.emitT2T(javaType(INT), javaType(kind)); - - case (OR, LONG) => jcode.emitLOR() - case (OR, INT) => jcode.emitIOR() - case (OR, _) => - jcode.emitIOR() - if (kind != BOOL) - jcode.emitT2T(javaType(INT), javaType(kind)); - - case (XOR, LONG) => jcode.emitLXOR() - case (XOR, INT) => jcode.emitIXOR() - case (XOR, _) => - jcode.emitIXOR() - if (kind != BOOL) - jcode.emitT2T(javaType(INT), javaType(kind)); - } - - case Shift(op, kind) => ((op, kind): @unchecked) match { - case (LSL, LONG) => jcode.emitLSHL() - case (LSL, INT) => jcode.emitISHL() - case (LSL, _) => - jcode.emitISHL() - jcode.emitT2T(javaType(INT), javaType(kind)) - - case (ASR, LONG) => jcode.emitLSHR() - case (ASR, INT) => jcode.emitISHR() - case (ASR, _) => - jcode.emitISHR() - jcode.emitT2T(javaType(INT), javaType(kind)) - - case (LSR, LONG) => jcode.emitLUSHR() - case (LSR, INT) => jcode.emitIUSHR() - case (LSR, _) => - jcode.emitIUSHR() - jcode.emitT2T(javaType(INT), javaType(kind)) - } - - case Comparison(op, kind) => ((op, kind): @unchecked) match { - case (CMP, LONG) => jcode.emitLCMP() - case (CMPL, FLOAT) => jcode.emitFCMPL() - case (CMPG, FLOAT) => jcode.emitFCMPG() - case (CMPL, DOUBLE) => jcode.emitDCMPL() - case (CMPG, DOUBLE) => jcode.emitDCMPL() - } - - case Conversion(src, dst) => - debuglog("Converting from: " + src + " to: " + dst) - if (dst == BOOL) { - println("Illegal conversion at: " + clasz + " at: " + pos.source + ":" + pos.line) - } else - jcode.emitT2T(javaType(src), javaType(dst)) - - case ArrayLength(_) => - jcode.emitARRAYLENGTH() - - case StartConcat => - jcode emitNEW StringBuilderClassName - jcode.emitDUP() - jcode.emitINVOKESPECIAL(StringBuilderClassName, - JMethod.INSTANCE_CONSTRUCTOR_NAME, - JMethodType.ARGLESS_VOID_FUNCTION) - - case StringConcat(el) => - val jtype = el match { - case REFERENCE(_) | ARRAY(_) => JAVA_LANG_OBJECT - case _ => javaType(el) - } - jcode.emitINVOKEVIRTUAL(StringBuilderClassName, - "append", - new JMethodType(StringBuilderType, - Array(jtype))) - case EndConcat => - jcode.emitINVOKEVIRTUAL(StringBuilderClassName, - "toString", - toStringType) - - case _ => - abort("Unimplemented primitive " + primitive) - } - } - - // genCode starts here - genBlocks(linearization) - - if (this.method.exh != Nil) - genExceptionHandlers; - } - - - /** Emit a Local variable table for debugging purposes. - * Synthetic locals are skipped. All variables are method-scoped. - */ - private def genLocalVariableTable(m: IMethod, jcode: JCode) { - val vars = m.locals filterNot (_.sym.isArtifact) - if (vars.isEmpty) return - - val pool = jclass.getConstantPool - val pc = jcode.getPC() - var anonCounter = 0 - var entries = 0 - vars.foreach { lv => - lv.ranges = mergeEntries(lv.ranges.reverse); - entries += lv.ranges.length - } - if (!jmethod.isStatic()) entries += 1 - - val lvTab = ByteBuffer.allocate(2 + 10 * entries) - def emitEntry(name: String, signature: String, idx: Short, start: Short, end: Short) { - lvTab putShort start - lvTab putShort end - lvTab putShort pool.addUtf8(name).toShort - lvTab putShort pool.addUtf8(signature).toShort - lvTab putShort idx - } - - lvTab.putShort(entries.toShort) - - if (!jmethod.isStatic()) { - emitEntry("this", jclass.getType().getSignature(), 0, 0.toShort, pc.toShort) - } - - for (lv <- vars) { - val name = if (javaName(lv.sym) eq null) { - anonCounter += 1 - "<anon" + anonCounter + ">" - } else javaName(lv.sym) - - val index = indexOf(lv).toShort - val tpe = javaType(lv.kind).getSignature() - for ((start, end) <- lv.ranges) { - emitEntry(name, tpe, index, start.toShort, (end - start).toShort) - } - } - val attr = - fjbgContext.JOtherAttribute(jclass, - jcode, - tpnme.LocalVariableTableATTR.toString, - lvTab.array()) - jcode addAttribute attr - } - - - /** For each basic block, the first PC address following it. */ - val endPC = new mutable.HashMap[BasicBlock, Int] - - ////////////////////// local vars /////////////////////// - - def sizeOf(k: TypeKind): Int = if(k.isWideType) 2 else 1 - - def indexOf(local: Local): Int = { - assert(local.index >= 0, "Invalid index for: " + local + "{" + local.## + "}: ") - local.index - } - - /** - * Compute the indexes of each local variable of the given - * method. *Does not assume the parameters come first!* - */ - def computeLocalVarsIndex(m: IMethod) { - var idx = if (m.symbol.isStaticMember) 0 else 1; - - for (l <- m.params) { - debuglog("Index value for " + l + "{" + l.## + "}: " + idx) - l.index = idx - idx += sizeOf(l.kind) - } - - for (l <- m.locals if !(m.params contains l)) { - debuglog("Index value for " + l + "{" + l.## + "}: " + idx) - l.index = idx - idx += sizeOf(l.kind) - } - } - - ////////////////////// Utilities //////////////////////// - - /** Merge adjacent ranges. */ - private def mergeEntries(ranges: List[(Int, Int)]): List[(Int, Int)] = - (ranges.foldLeft(Nil: List[(Int, Int)]) { (collapsed: List[(Int, Int)], p: (Int, Int)) => (collapsed, p) match { - case (Nil, _) => List(p) - case ((s1, e1) :: rest, (s2, e2)) if (e1 == s2) => (s1, e2) :: rest - case _ => p :: collapsed - }}).reverse - } - - private def mkFlags(args: Int*) = args.foldLeft(0)(_ | _) - - /** - * Return the Java modifiers for the given symbol. - * Java modifiers for classes: - * - public, abstract, final, strictfp (not used) - * for interfaces: - * - the same as for classes, without 'final' - * for fields: - * - public, private (*) - * - static, final - * for methods: - * - the same as for fields, plus: - * - abstract, synchronized (not used), strictfp (not used), native (not used) - * - * (*) protected cannot be used, since inner classes 'see' protected members, - * and they would fail verification after lifted. - */ - def javaFlags(sym: Symbol): Int = { - // constructors of module classes should be private - // PP: why are they only being marked private at this stage and not earlier? - val privateFlag = - sym.isPrivate || (sym.isPrimaryConstructor && isTopLevelModule(sym.owner)) - - // Final: the only fields which can receive ACC_FINAL are eager vals. - // Neither vars nor lazy vals can, because: - // - // Source: http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.5.3 - // "Another problem is that the specification allows aggressive - // optimization of final fields. Within a thread, it is permissible to - // reorder reads of a final field with those modifications of a final - // field that do not take place in the constructor." - // - // A var or lazy val which is marked final still has meaning to the - // scala compiler. The word final is heavily overloaded unfortunately; - // for us it means "not overridable". At present you can't override - // vars regardless; this may change. - // - // The logic does not check .isFinal (which checks flags for the FINAL flag, - // and includes symbols marked lateFINAL) instead inspecting rawflags so - // we can exclude lateFINAL. Such symbols are eligible for inlining, but to - // avoid breaking proxy software which depends on subclassing, we do not - // emit ACC_FINAL. - // Nested objects won't receive ACC_FINAL in order to allow for their overriding. - - val finalFlag = ( - (((sym.rawflags & Flags.FINAL) != 0) || isTopLevelModule(sym)) - && !sym.enclClass.isInterface - && !sym.isClassConstructor - && !sym.isMutable // lazy vals and vars both - ) - - // Primitives are "abstract final" to prohibit instantiation - // without having to provide any implementations, but that is an - // illegal combination of modifiers at the bytecode level so - // suppress final if abstract if present. - mkFlags( - if (privateFlag) ACC_PRIVATE else ACC_PUBLIC, - if (sym.isDeferred || sym.hasAbstractFlag) ACC_ABSTRACT else 0, - if (sym.isInterface) ACC_INTERFACE else 0, - if (finalFlag && !sym.hasAbstractFlag) ACC_FINAL else 0, - if (sym.isStaticMember) ACC_STATIC else 0, - if (sym.isBridge) ACC_BRIDGE | ACC_SYNTHETIC else 0, - if (sym.isArtifact) ACC_SYNTHETIC else 0, - if (sym.isClass && !sym.isInterface) ACC_SUPER else 0, - if (sym.isVarargsMethod) ACC_VARARGS else 0, - if (sym.hasFlag(Flags.SYNCHRONIZED)) JAVA_ACC_SYNCHRONIZED else 0 - ) - } - def javaFieldFlags(sym: Symbol) = ( - javaFlags(sym) | mkFlags( - if (sym hasAnnotation TransientAttr) ACC_TRANSIENT else 0, - if (sym hasAnnotation VolatileAttr) ACC_VOLATILE else 0, - if (sym.isMutable) 0 else ACC_FINAL - ) - ) - - def isTopLevelModule(sym: Symbol): Boolean = - exitingPickler { sym.isModuleClass && !sym.isImplClass && !sym.isNestedClass } - - def isStaticModule(sym: Symbol): Boolean = { - sym.isModuleClass && !sym.isImplClass && !sym.isLifted - } - -} diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVMUtil.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVMUtil.scala deleted file mode 100644 index 613f8f893e..0000000000 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVMUtil.scala +++ /dev/null @@ -1,141 +0,0 @@ -/* NSC -- new Scala compiler - * Copyright 2005-2013 LAMP/EPFL - * @author Iulian Dragos - */ - -package scala.tools.nsc -package backend.jvm - -import scala.collection.{ mutable, immutable } -import ch.epfl.lamp.fjbg._ - -trait GenJVMUtil { - self: GenJVM => - - import global._ - import icodes._ - import definitions._ - - /** Map from type kinds to the Java reference types. It is used for - * loading class constants. @see Predef.classOf. - */ - val classLiteral = immutable.Map[TypeKind, JObjectType]( - UNIT -> new JObjectType("java.lang.Void"), - BOOL -> new JObjectType("java.lang.Boolean"), - BYTE -> new JObjectType("java.lang.Byte"), - SHORT -> new JObjectType("java.lang.Short"), - CHAR -> new JObjectType("java.lang.Character"), - INT -> new JObjectType("java.lang.Integer"), - LONG -> new JObjectType("java.lang.Long"), - FLOAT -> new JObjectType("java.lang.Float"), - DOUBLE -> new JObjectType("java.lang.Double") - ) - - // Don't put this in per run caches. - private val javaNameCache = new mutable.WeakHashMap[Symbol, Name]() ++= List( - NothingClass -> binarynme.RuntimeNothing, - RuntimeNothingClass -> binarynme.RuntimeNothing, - NullClass -> binarynme.RuntimeNull, - RuntimeNullClass -> binarynme.RuntimeNull - ) - - /** This trait may be used by tools who need access to - * utility methods like javaName and javaType. (for instance, - * the Eclipse plugin uses it). - */ - trait BytecodeUtil { - - val conds = immutable.Map[TestOp, Int]( - EQ -> JExtendedCode.COND_EQ, - NE -> JExtendedCode.COND_NE, - LT -> JExtendedCode.COND_LT, - GT -> JExtendedCode.COND_GT, - LE -> JExtendedCode.COND_LE, - GE -> JExtendedCode.COND_GE - ) - - /** Specialized array conversion to prevent calling - * java.lang.reflect.Array.newInstance via TraversableOnce.toArray - */ - - def mkArray(xs: Traversable[JType]): Array[JType] = { val a = new Array[JType](xs.size); xs.copyToArray(a); a } - def mkArray(xs: Traversable[String]): Array[String] = { val a = new Array[String](xs.size); xs.copyToArray(a); a } - - /** Return the a name of this symbol that can be used on the Java - * platform. It removes spaces from names. - * - * Special handling: - * scala.Nothing erases to scala.runtime.Nothing$ - * scala.Null erases to scala.runtime.Null$ - * - * This is needed because they are not real classes, and they mean - * 'abrupt termination upon evaluation of that expression' or null respectively. - * This handling is done already in GenICode, but here we need to remove - * references from method signatures to these types, because such classes can - * not exist in the classpath: the type checker will be very confused. - */ - def javaName(sym: Symbol): String = - javaNameCache.getOrElseUpdate(sym, { - if (sym.isClass || (sym.isModule && !sym.isMethod)) - sym.javaBinaryName - else - sym.javaSimpleName - }).toString - - def javaType(t: TypeKind): JType = (t: @unchecked) match { - case UNIT => JType.VOID - case BOOL => JType.BOOLEAN - case BYTE => JType.BYTE - case SHORT => JType.SHORT - case CHAR => JType.CHAR - case INT => JType.INT - case LONG => JType.LONG - case FLOAT => JType.FLOAT - case DOUBLE => JType.DOUBLE - case REFERENCE(cls) => new JObjectType(javaName(cls)) - case ARRAY(elem) => new JArrayType(javaType(elem)) - } - - def javaType(t: Type): JType = javaType(toTypeKind(t)) - - def javaType(s: Symbol): JType = - if (s.isMethod) - new JMethodType( - if (s.isClassConstructor) JType.VOID else javaType(s.tpe.resultType), - mkArray(s.tpe.paramTypes map javaType) - ) - else - javaType(s.tpe) - - protected def genConstant(jcode: JExtendedCode, const: Constant) { - const.tag match { - case UnitTag => () - case BooleanTag => jcode emitPUSH const.booleanValue - case ByteTag => jcode emitPUSH const.byteValue - case ShortTag => jcode emitPUSH const.shortValue - case CharTag => jcode emitPUSH const.charValue - case IntTag => jcode emitPUSH const.intValue - case LongTag => jcode emitPUSH const.longValue - case FloatTag => jcode emitPUSH const.floatValue - case DoubleTag => jcode emitPUSH const.doubleValue - case StringTag => jcode emitPUSH const.stringValue - case NullTag => jcode.emitACONST_NULL() - case ClazzTag => - val kind = toTypeKind(const.typeValue) - val toPush = - if (kind.isValueType) classLiteral(kind) - else javaType(kind).asInstanceOf[JReferenceType] - - jcode emitPUSH toPush - - case EnumTag => - val sym = const.symbolValue - jcode.emitGETSTATIC(javaName(sym.owner), - javaName(sym), - javaType(sym.tpe.underlying)) - case _ => - abort("Unknown constant value: " + const) - } - } - } -} diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index e4bff1e192..9716c75215 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -810,8 +810,6 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") respond(response) { scopeMembers(pos) } } - private val Dollar = newTermName("$") - private class Members[M <: Member] extends LinkedHashMap[Name, Set[M]] { override def default(key: Name) = Set() @@ -827,7 +825,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") def add(sym: Symbol, pre: Type, implicitlyAdded: Boolean)(toMember: (Symbol, Type) => M) { if ((sym.isGetter || sym.isSetter) && sym.accessed != NoSymbol) { add(sym.accessed, pre, implicitlyAdded)(toMember) - } else if (!sym.name.decodedName.containsName(Dollar) && !sym.isSynthetic && sym.hasRawInfo) { + } else if (!sym.name.decodedName.containsName("$") && !sym.isSynthetic && sym.hasRawInfo) { val symtpe = pre.memberType(sym) onTypeError ErrorType matching(sym, symtpe, this(sym.name)) match { case Some(m) => diff --git a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala index 381dfeb261..a48c2a4b67 100644 --- a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala +++ b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala @@ -149,7 +149,7 @@ trait MemberHandlers { } class ModuleHandler(module: ModuleDef) extends MemberDefHandler(module) { - override def definesTerm = Some(name) + override def definesTerm = Some(name.toTermName) override def definesValue = true override def resultExtractionCode(req: Request) = codegenln("defined module ", name) diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 73cbeaa6c4..f4c8cf991d 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -125,7 +125,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { def makeSyntheticParam(count: Int, tpt: Tree): ValDef = makeParam(nme.syntheticParamName(count), tpt) def makeParam(name: String, tpt: Tree): ValDef = - makeParam(newTypeName(name), tpt) + makeParam(name: TermName, tpt) def makeParam(name: TermName, tpt: Tree): ValDef = ValDef(Modifiers(Flags.JAVA | Flags.PARAM), name, tpt, EmptyTree) @@ -448,7 +448,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { AppliedTypeTree(scalaDot(tpnme.JAVA_REPEATED_PARAM_CLASS_NAME), List(t)) } } - varDecl(in.currentPos, Modifiers(Flags.JAVA | Flags.PARAM), t, ident()) + varDecl(in.currentPos, Modifiers(Flags.JAVA | Flags.PARAM), t, ident().toTermName) } def optThrows() { @@ -542,7 +542,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { * these potential definitions are real or not. */ def fieldDecls(pos: Position, mods: Modifiers, tpt: Tree, name: Name): List[Tree] = { - val buf = ListBuffer[Tree](varDecl(pos, mods, tpt, name)) + val buf = ListBuffer[Tree](varDecl(pos, mods, tpt, name.toTermName)) val maybe = new ListBuffer[Tree] // potential variable definitions. while (in.token == COMMA) { in.nextToken @@ -550,10 +550,10 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { val name = ident() if (in.token == ASSIGN || in.token == SEMI) { // ... followed by a `=` or `;`, we know it's a real variable definition buf ++= maybe - buf += varDecl(in.currentPos, mods, tpt.duplicate, name) + buf += varDecl(in.currentPos, mods, tpt.duplicate, name.toTermName) maybe.clear() } else if (in.token == COMMA) { // ... if there's a comma after the ident, it could be a real vardef or not. - maybe += varDecl(in.currentPos, mods, tpt.duplicate, name) + maybe += varDecl(in.currentPos, mods, tpt.duplicate, name.toTermName) } else { // ... if there's something else we were still in the initializer of the // previous var def; skip to next comma or semicolon. skipTo(COMMA, SEMI) @@ -830,7 +830,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { // The STABLE flag is to signal to namer that this was read from a // java enum, and so should be given a Constant type (thereby making // it usable in annotations.) - ValDef(Modifiers(Flags.STABLE | Flags.JAVA | Flags.STATIC), name, enumType, blankExpr) + ValDef(Modifiers(Flags.STABLE | Flags.JAVA | Flags.STATIC), name.toTermName, enumType, blankExpr) } } diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala index 6e5ac4f409..ed27c1f1c8 100644 --- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala @@ -41,8 +41,7 @@ trait StandardScalaSettings { val optimise: BooleanSetting // depends on post hook which mutates other settings val print = BooleanSetting ("-print", "Print program with Scala-specific features removed.") val target = ChoiceSetting ("-target", "target", "Target platform for object files. All JVM 1.5 targets are deprecated.", - List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7"), - "jvm-1.6") + List("jvm-1.5", "jvm-1.6", "jvm-1.7")) val unchecked = BooleanSetting ("-unchecked", "Enable additional warnings where generated code depends on assumptions.") val uniqid = BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.") val usejavacp = BooleanSetting ("-usejavacp", "Utilize the java.class.path in classpath resolution.") diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 6d213af2b6..cb58111b51 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -252,8 +252,8 @@ abstract class ClassfileParser { } else { log("Couldn't find " + name + ": " + tpe + " inside: \n" + ownerTpe) f = tpe match { - case MethodType(_, _) => owner.newMethod(name, owner.pos) - case _ => owner.newVariable(name, owner.pos) + case MethodType(_, _) => owner.newMethod(name.toTermName, owner.pos) + case _ => owner.newVariable(name.toTermName, owner.pos) } f setInfo tpe log("created fake member " + f.fullName) @@ -282,7 +282,7 @@ abstract class ClassfileParser { if (in.buf(start).toInt != CONSTANT_NAMEANDTYPE) errorBadTag(start) val name = getName(in.getChar(start + 1).toInt) // create a dummy symbol for method types - val dummySym = ownerTpe.typeSymbol.newMethod(name, ownerTpe.typeSymbol.pos) + val dummySym = ownerTpe.typeSymbol.newMethod(name.toTermName, ownerTpe.typeSymbol.pos) var tpe = getType(dummySym, in.getChar(start + 3).toInt) // fix the return type, which is blindly set to the class currently parsed @@ -457,7 +457,7 @@ abstract class ClassfileParser { ss = name.subName(start, end) sym = owner.info.decls lookup ss if (sym == NoSymbol) { - sym = owner.newPackage(ss) setInfo completer + sym = owner.newPackage(ss.toTermName) setInfo completer sym.moduleClass setInfo completer owner.info.decls enter sym } @@ -604,7 +604,7 @@ abstract class ClassfileParser { } else { val name = pool.getName(in.nextChar) val info = pool.getType(in.nextChar) - val sym = getOwner(jflags).newValue(name, NoPosition, sflags) + val sym = getOwner(jflags).newValue(name.toTermName, NoPosition, sflags) val isEnum = (jflags & JAVA_ACC_ENUM) != 0 sym setInfo { @@ -639,7 +639,7 @@ abstract class ClassfileParser { in.skip(4); skipAttributes() } else { val name = pool.getName(in.nextChar) - val sym = getOwner(jflags).newMethod(name, NoPosition, sflags) + val sym = getOwner(jflags).newMethod(name.toTermName, NoPosition, sflags) var info = pool.getType(sym, (in.nextChar)) if (name == nme.CONSTRUCTOR) info match { diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala index b5459ec773..79b08bcabf 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala @@ -80,7 +80,7 @@ abstract class ICodeReader extends ClassfileParser { val jflags = in.nextChar val name = pool getName in.nextChar val owner = getOwner(jflags) - val dummySym = owner.newMethod(name, owner.pos, toScalaMethodFlags(jflags)) + val dummySym = owner.newMethod(name.toTermName, owner.pos, toScalaMethodFlags(jflags)) try { val ch = in.nextChar @@ -94,7 +94,7 @@ abstract class ICodeReader extends ClassfileParser { if (sym == NoSymbol) sym = owner.info.findMember(newTermName(name + nme.LOCAL_SUFFIX_STRING), 0, 0, false).suchThat(_.tpe =:= tpe) if (sym == NoSymbol) { - sym = if (field) owner.newValue(name, owner.pos, toScalaFieldFlags(jflags)) else dummySym + sym = if (field) owner.newValue(name.toTermName, owner.pos, toScalaFieldFlags(jflags)) else dummySym sym setInfoAndEnter tpe log(s"ICodeReader could not locate ${name.decode} in $owner. Created ${sym.defString}.") } diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala index 029eeab3e0..765ef39e6b 100644 --- a/src/compiler/scala/tools/nsc/transform/CleanUp.scala +++ b/src/compiler/scala/tools/nsc/transform/CleanUp.scala @@ -114,7 +114,7 @@ abstract class CleanUp extends Transform with ast.TreeDSL { } def addStaticMethodToClass(forBody: (Symbol, Symbol) => Tree): Symbol = { - val methSym = currentClass.newMethod(mkTerm(nme.reflMethodName), ad.pos, STATIC | SYNTHETIC) + val methSym = currentClass.newMethod(mkTerm(nme.reflMethodName.toString), ad.pos, STATIC | SYNTHETIC) val params = methSym.newSyntheticValueParams(List(ClassClass.tpe)) methSym setInfoAndEnter MethodType(params, MethodClass.tpe) diff --git a/src/compiler/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala index 323c7c7261..534a140684 100644 --- a/src/compiler/scala/tools/nsc/transform/Constructors.scala +++ b/src/compiler/scala/tools/nsc/transform/Constructors.scala @@ -60,7 +60,7 @@ abstract class Constructors extends Transform with ast.TreeDSL { // The constructor parameter corresponding to an accessor def parameter(acc: Symbol): Symbol = - parameterNamed(nme.getterName(acc.originalName)) + parameterNamed(nme.getterName(acc.originalName.toTermName)) // The constructor parameter with given name. This means the parameter // has given name, or starts with given name, and continues with a `$` afterwards. @@ -281,7 +281,7 @@ abstract class Constructors extends Transform with ast.TreeDSL { specializedStats find { case Assign(sel @ Select(This(_), _), rhs) => ( (sel.symbol hasFlag SPECIALIZED) - && (nme.unspecializedName(nme.localToGetter(sel.symbol.name)) == nme.localToGetter(sym.name)) + && (nme.unspecializedName(nme.localToGetter(sel.symbol.name.toTermName)) == nme.localToGetter(sym.name.toTermName)) ) case _ => false } @@ -399,7 +399,7 @@ abstract class Constructors extends Transform with ast.TreeDSL { def addGetter(sym: Symbol): Symbol = { val getr = addAccessor( - sym, nme.getterName(sym.name), getterFlags(sym.flags)) + sym, nme.getterName(sym.name.toTermName), getterFlags(sym.flags)) getr setInfo MethodType(List(), sym.tpe) defBuf += localTyper.typedPos(sym.pos)(DefDef(getr, Select(This(clazz), sym))) getr @@ -408,7 +408,7 @@ abstract class Constructors extends Transform with ast.TreeDSL { def addSetter(sym: Symbol): Symbol = { sym setFlag MUTABLE val setr = addAccessor( - sym, nme.getterToSetter(nme.getterName(sym.name)), setterFlags(sym.flags)) + sym, nme.getterToSetter(nme.getterName(sym.name.toTermName)), setterFlags(sym.flags)) setr setInfo MethodType(setr.newSyntheticValueParams(List(sym.tpe)), UnitClass.tpe) defBuf += localTyper.typed { //util.trace("adding setter def for "+setr) { diff --git a/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala b/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala index 521d732664..717c4b627b 100644 --- a/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala +++ b/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala @@ -184,7 +184,7 @@ abstract class ExtensionMethods extends Transform with TypingTransformers { def makeExtensionMethodSymbol = { val extensionName = extensionNames(origMeth).head val extensionMeth = ( - companion.moduleClass.newMethod(extensionName, origMeth.pos, origMeth.flags & ~OVERRIDE & ~PROTECTED | FINAL) + companion.moduleClass.newMethod(extensionName.toTermName, origMeth.pos, origMeth.flags & ~OVERRIDE & ~PROTECTED | FINAL) setAnnotations origMeth.annotations ) companion.info.decls.enter(extensionMeth) diff --git a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala index 4a23e65ad2..0198f959e3 100644 --- a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala +++ b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala @@ -247,8 +247,8 @@ abstract class LambdaLift extends InfoTransform { // SI-5652 If the lifted symbol is accessed from an inner class, it will be made public. (where?) // Generating a a unique name, mangled with the enclosing class name, avoids a VerifyError // in the case that a sub-class happens to lifts out a method with the *same* name. - val name = freshen(sym.name + nme.NAME_JOIN_STRING) - if (originalName.isTermName && !sym.enclClass.isImplClass && calledFromInner(sym)) nme.expandedName(name, sym.enclClass) + val name = freshen("" + sym.name + nme.NAME_JOIN_STRING) + if (originalName.isTermName && !sym.enclClass.isImplClass && calledFromInner(sym)) nme.expandedName(name.toTermName, sym.enclClass) else name } } @@ -290,7 +290,7 @@ abstract class LambdaLift extends InfoTransform { proxies(owner) = for (fv <- freeValues.toList) yield { val proxyName = proxyNames.getOrElse(fv, fv.name) - val proxy = owner.newValue(proxyName, owner.pos, newFlags) setInfo fv.info + val proxy = owner.newValue(proxyName.toTermName, owner.pos, newFlags) setInfo fv.info if (owner.isClass) owner.info.decls enter proxy proxy } diff --git a/src/compiler/scala/tools/nsc/transform/LazyVals.scala b/src/compiler/scala/tools/nsc/transform/LazyVals.scala index 481228fb3d..e6c9afb042 100644 --- a/src/compiler/scala/tools/nsc/transform/LazyVals.scala +++ b/src/compiler/scala/tools/nsc/transform/LazyVals.scala @@ -68,7 +68,7 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD curTree = tree tree match { - + case Block(_, _) => val block1 = super.transform(tree) val Block(stats, expr) = block1 @@ -79,7 +79,7 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD List(stat) }) treeCopy.Block(block1, stats1, expr) - + case DefDef(_, _, _, _, _, rhs) => atOwner(tree.symbol) { val (res, slowPathDef) = if (!sym.owner.isClass && sym.isLazy) { val enclosingClassOrDummyOrMethod = { @@ -100,9 +100,9 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD val (rhs1, sDef) = mkLazyDef(enclosingClassOrDummyOrMethod, transform(rhs), idx, sym) sym.resetFlag((if (lazyUnit(sym)) 0 else LAZY) | ACCESSOR) (rhs1, sDef) - } else + } else (transform(rhs), EmptyTree) - + val ddef1 = deriveDefDef(tree)(_ => if (LocalLazyValFinder.find(res)) typed(addBitmapDefs(sym, res)) else res) if (slowPathDef != EmptyTree) Block(slowPathDef, ddef1) else ddef1 } @@ -189,10 +189,10 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD case _ => prependStats(bmps, rhs) } } - + def mkSlowPathDef(clazz: Symbol, lzyVal: Symbol, cond: Tree, syncBody: List[Tree], stats: List[Tree], retVal: Tree): Tree = { - val defSym = clazz.newMethod(nme.newLazyValSlowComputeName(lzyVal.name), lzyVal.pos, STABLE | PRIVATE) + val defSym = clazz.newMethod(nme.newLazyValSlowComputeName(lzyVal.name.toTermName), lzyVal.pos, STABLE | PRIVATE) defSym setInfo MethodType(List(), lzyVal.tpe.resultType) defSym.owner = lzyVal.owner debuglog(s"crete slow compute path $defSym with owner ${defSym.owner} for lazy val $lzyVal") @@ -201,8 +201,8 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD val rhs: Tree = (gen.mkSynchronizedCheck(clazz, cond, syncBody, stats)).changeOwner(currentOwner -> defSym) DEF(defSym).mkTree(addBitmapDefs(lzyVal, BLOCK(rhs, retVal))) setSymbol defSym } - - + + def mkFastPathBody(clazz: Symbol, lzyVal: Symbol, cond: Tree, syncBody: List[Tree], stats: List[Tree], retVal: Tree): (Tree, Tree) = { val slowPathDef: Tree = mkSlowPathDef(clazz, lzyVal, cond, syncBody, stats, retVal) @@ -221,7 +221,7 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD * Similarly as for normal lazy val members (see Mixin), the result will be a tree of the form * { if ((bitmap&n & MASK) == 0) this.l$compute() * else l$ - * + * * def l$compute() = { synchronized(enclosing_class_or_dummy) { * if ((bitmap$n & MASK) == 0) { * l$ = <rhs> diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 135660ed27..3772a58c14 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -207,14 +207,14 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { // println("creating new getter for "+ field +" : "+ field.info +" at "+ field.locationString+(field hasFlag MUTABLE)) val newFlags = field.flags & ~PrivateLocal | ACCESSOR | lateDEFERRED | ( if (field.isMutable) 0 else STABLE ) // TODO preserve pre-erasure info? - clazz.newMethod(nme.getterName(field.name), field.pos, newFlags) setInfo MethodType(Nil, field.info) + clazz.newMethod(nme.getterName(field.name.toTermName), field.pos, newFlags) setInfo MethodType(Nil, field.info) } /** Create a new setter. Setters are never private or local. They are * always accessors and deferred. */ def newSetter(field: Symbol): Symbol = { //println("creating new setter for "+field+field.locationString+(field hasFlag MUTABLE)) - val setterName = nme.getterToSetter(nme.getterName(field.name)) + val setterName = nme.getterToSetter(nme.getterName(field.name.toTermName)) val newFlags = field.flags & ~PrivateLocal | ACCESSOR | lateDEFERRED val setter = clazz.newMethod(setterName, field.pos, newFlags) // TODO preserve pre-erasure info? @@ -315,7 +315,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { // carries over the current entry in the type history) val sym = enteringErasure { // so we have a type history entry before erasure - clazz.newValue(nme.getterToLocal(mixinMember.name), mixinMember.pos).setInfo(mixinMember.tpe.resultType) + clazz.newValue(nme.getterToLocal(mixinMember.name.toTermName), mixinMember.pos).setInfo(mixinMember.tpe.resultType) } sym updateInfo mixinMember.tpe.resultType // info at current phase @@ -711,7 +711,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { */ def bitmapFor(clazz0: Symbol, offset: Int, field: Symbol): Symbol = { val category = bitmapCategory(field) - val bitmapName = nme.newBitmapName(category, offset / flagsPerBitmap(field)) + val bitmapName = nme.newBitmapName(category, offset / flagsPerBitmap(field)).toTermName val sym = clazz0.info.decl(bitmapName) assert(!sym.isOverloaded, sym) @@ -775,7 +775,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { def mkSlowPathDef(clazz: Symbol, lzyVal: Symbol, cond: Tree, syncBody: List[Tree], stats: List[Tree], retVal: Tree, attrThis: Tree, args: List[Tree]): Symbol = { - val defSym = clazz.newMethod(nme.newLazyValSlowComputeName(lzyVal.name), lzyVal.pos, PRIVATE) + val defSym = clazz.newMethod(nme.newLazyValSlowComputeName(lzyVal.name.toTermName), lzyVal.pos, PRIVATE) val params = defSym newSyntheticValueParams args.map(_.symbol.tpe) defSym setInfoAndEnter MethodType(params, lzyVal.tpe.resultType) val rhs: Tree = (gen.mkSynchronizedCheck(attrThis, cond, syncBody, stats)).changeOwner(currentOwner -> defSym) diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 2574644727..4e4c1b98ac 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -323,11 +323,11 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { */ private def specializedName(name: Name, types1: List[Type], types2: List[Type]): TermName = { if (nme.INITIALIZER == name || (types1.isEmpty && types2.isEmpty)) - name + name.toTermName else if (nme.isSetterName(name)) - nme.getterToSetter(specializedName(nme.setterToGetter(name), types1, types2)) + nme.getterToSetter(specializedName(nme.setterToGetter(name.toTermName), types1, types2)) else if (nme.isLocalName(name)) - nme.getterToLocal(specializedName(nme.localToGetter(name), types1, types2)) + nme.getterToLocal(specializedName(nme.localToGetter(name.toTermName), types1, types2)) else { val (base, cs, ms) = nme.splitSpecializedName(name) newTermName(base.toString + "$" @@ -689,7 +689,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { def mkAccessor(field: Symbol, name: Name) = { val newFlags = (SPECIALIZED | m.getter(clazz).flags) & ~(LOCAL | CASEACCESSOR | PARAMACCESSOR) // we rely on the super class to initialize param accessors - val sym = sClass.newMethod(name, field.pos, newFlags) + val sym = sClass.newMethod(name.toTermName, field.pos, newFlags) info(sym) = SpecializedAccessor(field) sym } @@ -708,7 +708,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { // debuglog("m: " + m + " isLocal: " + nme.isLocalName(m.name) + " specVal: " + specVal.name + " isLocal: " + nme.isLocalName(specVal.name)) if (nme.isLocalName(m.name)) { - val specGetter = mkAccessor(specVal, nme.localToGetter(specVal.name)) setInfo MethodType(Nil, specVal.info) + val specGetter = mkAccessor(specVal, nme.localToGetter(specVal.name.toTermName)) setInfo MethodType(Nil, specVal.info) val origGetter = overrideIn(sClass, m.getter(clazz)) info(origGetter) = Forward(specGetter) enterMember(specGetter) diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index 65b9eb79b3..19b9c188b0 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -807,7 +807,7 @@ abstract class UnCurry extends InfoTransform } // create the symbol - val forwsym = currentClass.newMethod(dd.name, dd.pos, VARARGS | SYNTHETIC | flatdd.symbol.flags) setInfo forwtype + val forwsym = currentClass.newMethod(dd.name.toTermName, dd.pos, VARARGS | SYNTHETIC | flatdd.symbol.flags) setInfo forwtype // create the tree val forwtree = theTyper.typedPos(dd.pos) { diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala index a6d11f13d4..b176782b1f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala @@ -511,7 +511,7 @@ trait ContextErrors { NormalTypeError(tree, fun.tpe+" does not take parameters") // Dynamic - def DynamicVarArgUnsupported(tree: Tree, name: String) = + def DynamicVarArgUnsupported(tree: Tree, name: Name) = issueNormalTypeError(tree, name+ " does not support passing a vararg parameter") def DynamicRewriteError(tree: Tree, err: AbsTypeError) = { diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 1af61d31ec..c0d2f44c7b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -996,7 +996,14 @@ trait Contexts { self: Analyzer => if (settings.lint.value && selectors.nonEmpty && result != NoSymbol && pos != NoPosition) recordUsage(current, result) - result + // Harden against the fallout from bugs like SI-6745 + // + // [JZ] I considered issuing a devWarning and moving the + // check inside the above loop, as I believe that + // this always represents a mistake on the part of + // the caller. + if (definitions isImportable result) result + else NoSymbol } private def selectorString(s: ImportSelector): String = { if (s.name == nme.WILDCARD && s.rename == null) "_" diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala index f595aa7dc7..4d1ab98fa0 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala @@ -317,7 +317,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces { def sigma(tpe: Type): Type = SigmaTypeMap(tpe) def makeParam(name: Name, pos: Position, tpe: Type, flags: Long) = - macroDef.newValueParameter(name, pos, flags) setInfo tpe + macroDef.newValueParameter(name.toTermName, pos, flags) setInfo tpe def implType(isType: Boolean, origTpe: Type): Type = { def tsym = if (isType) WeakTagClass else ExprClass def targ = origTpe.typeArgs.headOption getOrElse NoType diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala index 8e2a1fc5dc..18bc95af39 100644 --- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala +++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala @@ -60,7 +60,7 @@ trait MethodSynthesis { overrideFlag | SYNTHETIC } def newMethodFlags(method: Symbol) = { - val overrideFlag = if (isOverride(method.name)) OVERRIDE else 0L + val overrideFlag = if (isOverride(method.name.toTermName)) OVERRIDE else 0L (method.flags | overrideFlag | SYNTHETIC) & ~DEFERRED } @@ -68,11 +68,13 @@ trait MethodSynthesis { localTyper typed ValOrDefDef(method, f(method)) private def createInternal(name: Name, f: Symbol => Tree, info: Type): Tree = { - val m = clazz.newMethod(name.toTermName, clazz.pos.focus, newMethodFlags(name)) + val name1 = name.toTermName + val m = clazz.newMethod(name1, clazz.pos.focus, newMethodFlags(name1)) finishMethod(m setInfoAndEnter info, f) } private def createInternal(name: Name, f: Symbol => Tree, infoFn: Symbol => Type): Tree = { - val m = clazz.newMethod(name.toTermName, clazz.pos.focus, newMethodFlags(name)) + val name1 = name.toTermName + val m = clazz.newMethod(name1, clazz.pos.focus, newMethodFlags(name1)) finishMethod(m setInfoAndEnter infoFn(m), f) } private def cloneInternal(original: Symbol, f: Symbol => Tree, name: Name): Tree = { diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 79fc0e0081..538e2d1d76 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -300,11 +300,11 @@ trait Namers extends MethodSynthesis { case DefDef(_, nme.CONSTRUCTOR, _, _, _, _) => owner.newConstructor(pos, flags) case DefDef(_, _, _, _, _, _) => owner.newMethod(name.toTermName, pos, flags) case ClassDef(_, _, _, _) => owner.newClassSymbol(name.toTypeName, pos, flags) - case ModuleDef(_, _, _) => owner.newModule(name, pos, flags) + case ModuleDef(_, _, _) => owner.newModule(name.toTermName, pos, flags) case PackageDef(pid, _) => createPackageSymbol(pos, pid) case ValDef(_, _, _, _) => - if (isParameter) owner.newValueParameter(name, pos, flags) - else owner.newValue(name, pos, flags) + if (isParameter) owner.newValueParameter(name.toTermName, pos, flags) + else owner.newValue(name.toTermName, pos, flags) } } private def createFieldSymbol(tree: ValDef): TermSymbol = diff --git a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala index 19f0b56e94..3bb6ae53dc 100644 --- a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala +++ b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala @@ -480,7 +480,7 @@ trait TypeDiagnostics { && (m.isPrivate || m.isLocal) && !targets(m) && !(m.name == nme.WILDCARD) // e.g. val _ = foo - && !ignoreNames(m.name) // serialization methods + && !ignoreNames(m.name.toTermName) // serialization methods && !isConstantType(m.info.resultType) // subject to constant inlining && !treeTypes.exists(_ contains m) // e.g. val a = new Foo ; new a.Bar ) diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala index b1d343cee9..42cdfcdd49 100644 --- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala +++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala @@ -148,13 +148,13 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf => unwrapped = new Transformer { override def transform(tree: Tree): Tree = tree match { - case Ident(name) if invertedIndex contains name => + case Ident(name: TermName) if invertedIndex contains name => Ident(invertedIndex(name)) setType tree.tpe case _ => super.transform(tree) } }.transform(unwrapped) - new TreeTypeSubstituter(dummies1 map (_.symbol), dummies1 map (dummy => SingleType(NoPrefix, invertedIndex(dummy.symbol.name)))).traverse(unwrapped) + new TreeTypeSubstituter(dummies1 map (_.symbol), dummies1 map (dummy => SingleType(NoPrefix, invertedIndex(dummy.symbol.name.toTermName)))).traverse(unwrapped) unwrapped = if (expr0.isTerm) unwrapped else unwrapFromTerm(unwrapped) unwrapped } diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala index c591030bce..4924e056af 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala @@ -35,7 +35,7 @@ trait CPSUtils { lazy val MarkerCPSAdaptMinus = rootMirror.getRequiredClass("scala.util.continuations.cpsMinus") lazy val Context = rootMirror.getRequiredClass("scala.util.continuations.ControlContext") - lazy val ModCPS = rootMirror.getRequiredPackage("scala.util.continuations") + lazy val ModCPS = rootMirror.getPackage("scala.util.continuations") lazy val MethShiftUnit = definitions.getMember(ModCPS, cpsNames.shiftUnit) lazy val MethShiftUnit0 = definitions.getMember(ModCPS, cpsNames.shiftUnit0) diff --git a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala index f16cfb10f8..801c328177 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala @@ -345,7 +345,7 @@ abstract class SelectiveCPSTransform extends PluginComponent with val ctxSym = currentOwner.newValue(newTermName("" + vd.symbol.name + cpsNames.shiftSuffix)).setInfo(rhs1.tpe) val ctxDef = localTyper.typed(ValDef(ctxSym, rhs1)) def ctxRef = localTyper.typed(Ident(ctxSym)) - val argSym = currentOwner.newValue(vd.symbol.name).setInfo(tpe) + val argSym = currentOwner.newValue(vd.symbol.name.toTermName).setInfo(tpe) val argDef = localTyper.typed(ValDef(argSym, Select(ctxRef, ctxRef.tpe.member(cpsNames.getTrivialValue)))) val switchExpr = localTyper.typedPos(vd.symbol.pos) { val body2 = mkBlock(bodyStms, bodyExpr).duplicate // dup before typing! diff --git a/src/eclipse/README.md b/src/eclipse/README.md index 39a3f457a0..d135f99418 100644 --- a/src/eclipse/README.md +++ b/src/eclipse/README.md @@ -44,7 +44,7 @@ If you want to go back to normal (for instance, to commit your changes to projec DETAILS ======= -The compiler project depends on the library, reflect, asm and fjbg projects. The +The compiler project depends on the library, reflect, and asm projects. The builder will take care of the correct ordering, and changes in one project will be picked up by the dependent projects. diff --git a/src/eclipse/fjbg/.classpath b/src/eclipse/fjbg/.classpath deleted file mode 100644 index 3e2f55f48a..0000000000 --- a/src/eclipse/fjbg/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="fjbg"/> - <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="output" path="libs-classes-fjbg"/> -</classpath> diff --git a/src/eclipse/fjbg/.project b/src/eclipse/fjbg/.project deleted file mode 100644 index 8acea9f5fe..0000000000 --- a/src/eclipse/fjbg/.project +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>fjbg</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.scala-ide.sdt.core.scalabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.scala-ide.sdt.core.scalanature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> - <linkedResources> - <link> - <name>fjbg</name> - <type>2</type> - <locationURI>SCALA_BASEDIR/src/fjbg</locationURI> - </link> - <link> - <name>libs-classes-fjbg</name> - <type>2</type> - <locationURI>SCALA_BASEDIR/build/libs/classes/fjbg</locationURI> - </link> - </linkedResources> -</projectDescription> diff --git a/src/eclipse/scala-compiler/.classpath b/src/eclipse/scala-compiler/.classpath index 40a4ed9996..e6af46c68f 100644 --- a/src/eclipse/scala-compiler/.classpath +++ b/src/eclipse/scala-compiler/.classpath @@ -3,7 +3,6 @@ <classpathentry kind="src" path="compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/fjbg"/> <classpathentry combineaccessrules="false" kind="src" path="/asm"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/ant/ant.jar"/> diff --git a/src/fjbg/ch/epfl/lamp/fjbg/FJBGContext.java b/src/fjbg/ch/epfl/lamp/fjbg/FJBGContext.java deleted file mode 100644 index 9856dc7311..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/FJBGContext.java +++ /dev/null @@ -1,195 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.IOException; - -/** - * Context in which FJBG executes. Used both as a factory for most - * FJBG classes and as a repository for other factories. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class FJBGContext { - /** Class file major version */ - final int MAJOR_VERSION; - - /** Class file minor version */ - final int MINOR_VERSION; - - public FJBGContext() { - this(45, 3); - } - - public FJBGContext(int major, int minor) { - MAJOR_VERSION = major; - MINOR_VERSION = minor; - } - - // Factory methods - ////////////////////////////////////////////////////////////////////// - - public JClass JClass(int accessFlags, - String name, - String superclassName, - String[] interfaceNames, - String sourceFileName) { - return new JClass(this, - accessFlags, - name, - superclassName, - interfaceNames, - sourceFileName); - } - - public JClass JClass(DataInputStream stream) - throws IOException { - return new JClass(this, stream); - } - - public JConstantPool JConstantPool() { - return new JConstantPool(this); - } - - public JConstantPool JConstantPool(DataInputStream stream) - throws IOException { - return new JConstantPool(this, stream); - } - - public JField JField(JClass owner, - int accessFlags, - String name, - JType type) { - return new JField(this, - owner, - accessFlags, - name, - type); - } - - public JField JField(JClass owner, DataInputStream stream) - throws IOException { - return new JField(this, owner, stream); - } - - public JMethod JMethod(JClass owner, - int accessFlags, - String name, - JType returnType, - JType[] argTypes, - String[] argNames) { - return new JMethod(this, - owner, - accessFlags, - name, - returnType, - argTypes, - argNames); - } - - public JMethod JMethod(JClass owner, - int accessFlags, - String name, - JMethodType type, - String[] argNames) { - return JMethod(owner, - accessFlags, - name, - type.getReturnType(), - type.getArgumentTypes(), - argNames); - } - - public JMethod JMethod(JClass owner, DataInputStream stream) - throws IOException { - return new JMethod(this, owner, stream); - } - - public JLocalVariable JLocalVariable(JMethod owner, - JType type, - String name, - int index) { - return new JLocalVariable(this, owner, type, name, index); - } - - public JCode JCode(JClass clazz, JMethod owner) { - return new JExtendedCode(this, clazz, owner); - } - - public JCode JCode(JClass clazz, JMethod owner, DataInputStream stream) - throws IOException { - return new JCode(this, clazz, owner, stream); - } - - public JAttributeFactory JAttributeFactory() { - return new JAttributeFactory(this); - } - - // Attributes - public JCodeAttribute JCodeAttribute(JClass clazz, JMethod owner) { - return new JCodeAttribute(this, clazz, owner); - } - - public JEnclosingMethodAttribute JEnclosingMethodAttribute(JClass clazz, - String className, - String methodName, - JType methodType) { - return new JEnclosingMethodAttribute(this, clazz, className, methodName, methodType); - } - - public JExceptionsAttribute JExceptionsAttribute(JClass clazz, - JMethod owner) { - return new JExceptionsAttribute(this, clazz, owner); - } - - public JLineNumberTableAttribute JLineNumberTableAttribute(JClass clazz, - JCode owner) { - return new JLineNumberTableAttribute(this, clazz, owner); - } - - public JLocalVariableTableAttribute JLocalVariableTableAttribute(JClass clazz, - JCode owner) { - return new JLocalVariableTableAttribute(this, clazz, owner); - } - - public JOtherAttribute JOtherAttribute(JClass clazz, - Object owner, - String name, - byte[] contents, - int length) { - return new JOtherAttribute(this, clazz, owner, name, contents, length); - } - - public JOtherAttribute JOtherAttribute(JClass clazz, - Object owner, - String name, - byte[] contents) { - return JOtherAttribute(clazz, owner, name, contents, contents.length); - } - - public JSourceFileAttribute JSourceFileAttribute(JClass clazz, - String sourceFileName) { - return new JSourceFileAttribute(this, clazz, sourceFileName); - } - - public JStackMapTableAttribute JStackMapTableAttribute(JClass clazz, - JCode owner) { - return new JStackMapTableAttribute(this, clazz, owner); - } - - /// Repository - ////////////////////////////////////////////////////////////////////// - - protected JAttributeFactory jAttributeFactory = null; - public JAttributeFactory getJAttributeFactory() { - if (jAttributeFactory == null) - jAttributeFactory = JAttributeFactory(); - return jAttributeFactory; - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JAccessFlags.java b/src/fjbg/ch/epfl/lamp/fjbg/JAccessFlags.java deleted file mode 100644 index 01d8cc9a7e..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JAccessFlags.java +++ /dev/null @@ -1,35 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Definition of access flags for fields, methods and classes. - * - * @author Michel Schinz - * @version 1.0 - */ - -public interface JAccessFlags { - public static int ACC_PUBLIC = 0x0001; - public static int ACC_PRIVATE = 0x0002; - public static int ACC_PROTECTED = 0x0004; - public static int ACC_STATIC = 0x0008; - public static int ACC_FINAL = 0x0010; - public static int ACC_SUPER = 0x0020; - public static int ACC_VOLATILE = 0x0040; - public static int ACC_TRANSIENT = 0x0080; - public static int ACC_NATIVE = 0x0100; - public static int ACC_INTERFACE = 0x0200; - public static int ACC_ABSTRACT = 0x0400; - public static int ACC_STRICT = 0x0800; - public static int ACC_SYNTHETIC = 0x1000; - public static int ACC_ANNOTATION= 0x2000; - public static int ACC_ENUM = 0x4000; - - // 1.5 specifics - public static int ACC_BRIDGE = 0x0040; - public static int ACC_VARARGS = 0x0080; -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JArrayType.java b/src/fjbg/ch/epfl/lamp/fjbg/JArrayType.java deleted file mode 100644 index 61a04523ca..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JArrayType.java +++ /dev/null @@ -1,62 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Types for Java arrays. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JArrayType extends JReferenceType { - protected final JType elementType; - protected String signature = null; - - public JArrayType(JType elementType) { - this.elementType = elementType; - } - - public int getSize() { return 1; } - - public String getSignature() { - if (signature == null) - signature = "[" + elementType.getSignature(); - return signature; - } - - public String getDescriptor() { - return getSignature(); - } - - public int getTag() { return T_ARRAY; } - - public JType getElementType() { return elementType; } - - public String toString() { - return elementType.toString() + "[]"; - } - - public boolean isArrayType() { return true; } - - public boolean isCompatibleWith(JType other) { - if (other instanceof JObjectType) - return (JObjectType)other == JObjectType.JAVA_LANG_OBJECT; - else if (other instanceof JArrayType) - return elementType.isCompatibleWith(((JArrayType)other).elementType); - else return other == JType.REFERENCE; - } - - public static JArrayType BOOLEAN = new JArrayType(JType.BOOLEAN); - public static JArrayType BYTE = new JArrayType(JType.BYTE); - public static JArrayType CHAR = new JArrayType(JType.CHAR); - public static JArrayType SHORT = new JArrayType(JType.SHORT); - public static JArrayType INT = new JArrayType(JType.INT); - public static JArrayType FLOAT = new JArrayType(JType.FLOAT); - public static JArrayType LONG = new JArrayType(JType.LONG); - public static JArrayType DOUBLE = new JArrayType(JType.DOUBLE); - public static JArrayType REFERENCE = new JArrayType(JType.REFERENCE); -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JAttribute.java deleted file mode 100644 index 6a825beb18..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JAttribute.java +++ /dev/null @@ -1,84 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.*; - -/** - * Abstract superclass for attributes which can be attached to various - * parts of a class file. - * - * Attributes are used for classes (section 4.2), fields (section 4.6), - * methods (section 4.7) and the Code attribute (section 4.8.3). - * See sections 4.2 and later of the JVM specification. - * - * @author Michel Schinz - * @version 1.0 - */ - -public abstract class JAttribute { - protected final int nameIdx; - - static public void writeTo(List/*<JAttribute>*/ attrs, DataOutputStream stream) - throws IOException { - stream.writeShort(attrs.size()); - Iterator attrsIt = attrs.iterator(); - while (attrsIt.hasNext()) { - JAttribute attr = (JAttribute)attrsIt.next(); - attr.writeTo(stream); - } - } - - static public List/*<JAttribute>*/ readFrom(FJBGContext context, - JClass clazz, - Object owner, - DataInputStream stream) - throws IOException { - JAttributeFactory factory = context.getJAttributeFactory(); - int count = stream.readShort(); - ArrayList list = new ArrayList(count); - for (int i = 0; i < count; ++i) - list.add(factory.newInstance(clazz, owner, stream)); - return list; - } - - public JAttribute(FJBGContext context, JClass clazz) { - this.nameIdx = clazz.getConstantPool().addUtf8(getName()); - } - - public JAttribute(FJBGContext context, JClass clazz, String name) { - this.nameIdx = clazz.getConstantPool().addUtf8(name); - } - - abstract public String getName(); - - /** - * Write the attribute to a stream. - */ - public void writeTo(DataOutputStream stream) throws IOException { - int contentsSize = getSize(); - - stream.writeShort(nameIdx); - stream.writeInt(contentsSize); - int streamSizeBefore = stream.size(); - writeContentsTo(stream); - int streamSizeDiff = stream.size() - streamSizeBefore; - - assert contentsSize == streamSizeDiff - : "invalid size for attribute " + getName() - + " given: " + contentsSize - + " actual: " + streamSizeDiff; - } - - // Note: it is not legal to add data to the constant pool during - // the execution of any of the following two methods. - protected abstract int getSize(); - protected abstract void writeContentsTo(DataOutputStream stream) - throws IOException; -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JAttributeFactory.java b/src/fjbg/ch/epfl/lamp/fjbg/JAttributeFactory.java deleted file mode 100644 index 33cdce2760..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JAttributeFactory.java +++ /dev/null @@ -1,101 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; - -/** - * Extensible factory to build subclasses of JAttribute based on an - * attribute name. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JAttributeFactory { - protected FJBGContext context; - protected HashMap/*<String, Constructor>*/ constructors = new HashMap(); - - protected final static Class[] CONSTRUCTOR_ARGS = new Class[] { - FJBGContext.class, - JClass.class, - Object.class, - String.class, - int.class, - DataInputStream.class - }; - - protected final static Constructor defaultDefaultConstructor; - static { - try { - defaultDefaultConstructor = - JOtherAttribute.class.getConstructor(CONSTRUCTOR_ARGS); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } - } - - protected final Constructor defaultConstructor; - - public JAttributeFactory(FJBGContext context, - Constructor defaultConstructor) { - this.context = context; - this.defaultConstructor = defaultConstructor; - registerClass("Code", JCodeAttribute.class); - registerClass("ConstantValue", JConstantValueAttribute.class); - registerClass("EnclosingMethod", JEnclosingMethodAttribute.class); - registerClass("Exceptions", JExceptionsAttribute.class); - registerClass("InnerClasses", JInnerClassesAttribute.class); - registerClass("LineNumberTable", JLineNumberTableAttribute.class); - registerClass("LocalVariableTable", JLocalVariableTableAttribute.class); - registerClass("SourceFile", JSourceFileAttribute.class); - registerClass("StackMapTable", JStackMapTableAttribute.class); - } - - public JAttributeFactory(FJBGContext context) { - this(context, defaultDefaultConstructor); - } - - public void registerClass(String attributeName, - Class clazz) { - if (! JAttribute.class.isAssignableFrom(clazz)) - throw new IllegalArgumentException("Not a subclass of JAttribute: " - + clazz); - - try { - Constructor constr = clazz.getConstructor(CONSTRUCTOR_ARGS); - constructors.put(attributeName, constr); - } catch (NoSuchMethodException e) { - throw new IllegalArgumentException("No appropriate constructor for " - + clazz); - } - } - - public JAttribute newInstance(JClass clazz, - Object owner, - DataInputStream stream) - throws IOException { - String name = clazz.getConstantPool().lookupUtf8(stream.readShort()); - Integer size = new Integer(stream.readInt()); - Constructor constr = (Constructor)constructors.get(name); - if (constr == null) constr = defaultConstructor; - - Object[] args = new Object[] { context, clazz, owner, name, size, stream }; - try { - return (JAttribute)constr.newInstance(args); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JClass.java b/src/fjbg/ch/epfl/lamp/fjbg/JClass.java deleted file mode 100644 index bb1538ec23..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JClass.java +++ /dev/null @@ -1,420 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.util.*; -import java.io.*; - -/** - * Representation of a Java class. - * - * @author Michel Schinz, Stephane Micheloud - * @version 1.1 - */ -public class JClass extends JMember { - - /** Magic number for Java class files. */ - public final static int MAGIC_NUMBER = 0xCAFEBABE; - - protected final JAttributeFactory attributeFactory; - - protected final String superclassName; - protected final String[] interfaceNames; - protected final String sourceFileName; - protected final JConstantPool pool; - - public final static String[] NO_INTERFACES = new String[0]; - - protected final LinkedList/*<JMethod>*/ methods = new LinkedList(); - protected final LinkedList/*<JField>*/ fields = new LinkedList(); - - protected JInnerClassesAttribute innerClasses; - - protected int major; - protected int minor; - - /** - * Creates a new class with its access flags, name, superclass name, - * interfaces names and source file name initialized to a given value. - * The constructor also initializes the pool and adds a sourceFileName - * attribute to the class. - * @param accessFlags the int representing the access flags of the class. - * @param name the string representing the name of the class. - * @param superclassName the string representing the name of the class' - * superclass. - * @param interfaceNames the list of strings representing the names of the - * interfaces implemented by the class. - * @param sourceFileName name of the file from which the class was compiled. - */ - protected JClass(FJBGContext context, - int accessFlags, - String name, - String superclassName, - String[] interfaceNames, - String sourceFileName) { - super(context, accessFlags, name); - this.attributeFactory = context.getJAttributeFactory(); - - this.major = context.MAJOR_VERSION; - this.minor = context.MINOR_VERSION; - - this.superclassName = superclassName; - this.interfaceNames = interfaceNames; - this.sourceFileName = sourceFileName; - this.pool = context.JConstantPool(); - if (sourceFileName != null) - addAttribute(context.JSourceFileAttribute(this, sourceFileName)); - } - - protected JClass(FJBGContext context, DataInputStream stream) - throws IOException { - super(context); - this.attributeFactory = context.getJAttributeFactory(); - - int magic = stream.readInt(); - if (magic != MAGIC_NUMBER) - throw new IllegalArgumentException("invalid magic number: "+magic); - - minor = stream.readShort(); - major = stream.readShort(); - pool = context.JConstantPool(stream); - accessFlags = stream.readShort(); - - // This class, super class and interfaces - name = pool.lookupClass(stream.readShort()); - superclassName = pool.lookupClass(stream.readShort()); - interfaceNames = new String[stream.readShort()]; - for (int i = 0; i < interfaceNames.length; ++i) - interfaceNames[i] = pool.lookupClass(stream.readShort()); - - // Fields, methods and attributes - int fieldsCount = stream.readShort(); - for (int i = 0; i < fieldsCount; ++i) - addField(context.JField(this, stream)); - - int methodsCount = stream.readShort(); - for (int i = 0; i < methodsCount; ++i) - addMethod(context.JMethod(this, stream)); - - String fileName = null; - int attributesCount = stream.readShort(); - for (int i = 0; i < attributesCount; ++i) { - JAttribute attr = attributeFactory.newInstance(this, this, stream); - if (attr instanceof JSourceFileAttribute) - fileName = ((JSourceFileAttribute)attr).getFileName(); - else if (attr instanceof JInnerClassesAttribute) - innerClasses = (JInnerClassesAttribute)attr; - addAttribute(attr); - } - sourceFileName = fileName; - } - - /** - * Gets the name of the class' superclass. - * @return The string representing the name of the class' superclass. - */ - public String getSuperclassName() { return superclassName; } - - /** - * Gets the names of the interfaces implemented by the class. - * @return The array containing the string representations of the - * names of the interfaces implemented by the class. - */ - public String[] getInterfaceNames() { return interfaceNames; } - - /** - * Gets the source file name of this class. - * @return The string representing the source file name of this class. - */ - public String getSourceFileName() { return sourceFileName; } - - /** - * Gets the type of the objects that are instances of the class. - * @return The type of the instances of the class. - */ - public JType getType() { return new JObjectType(name); } - - public JClass getJClass() { return this; } - - public boolean isPublic() { - return (accessFlags & JAccessFlags.ACC_PUBLIC) != 0; - } - - public boolean isPrivate() { - return (accessFlags & JAccessFlags.ACC_PRIVATE) != 0; - } - - public boolean isProtected() { - return (accessFlags & JAccessFlags.ACC_PROTECTED) != 0; - } - - public boolean isStatic() { - return (accessFlags & JAccessFlags.ACC_STATIC) != 0; - } - - public boolean isFinal() { - return (accessFlags & JAccessFlags.ACC_FINAL) != 0; - } - - public boolean isAbstract() { - return (accessFlags & JAccessFlags.ACC_ABSTRACT) != 0; - } - - /** - * Gets the version number of the class. - * @param major The int representing the major part of the version number - * of the class. - * @param minor The int representing the minor part of the version number - * of the class. - */ - public void setVersion(int major, int minor) { - assert !frozen; - this.major = major; - this.minor = minor; - } - - /** - * Gets the major part of the number describing the version of the class. - * @return The int representing the major part of the version number of - * the class. - */ - public int getMajorVersion() { return major; } - - /** - * Gets the minor part of the number describing the version of the class. - * @return The int representing the minor part of the version number of - * the class. - */ - public int getMinorVersion() { return minor; } - - /** - * Gets the constant pool of the class. - * @return The constant pool of the class. - */ - public JConstantPool getConstantPool() { return pool; } - - public JInnerClassesAttribute getInnerClasses() { - if (innerClasses == null) { - innerClasses = new JInnerClassesAttribute(context, this); - addAttribute(innerClasses); - } - return innerClasses; - } - - /** - * Decides if the class is an interface. - * @return The boolean representing if the class is an interface or not. - */ - public boolean isInterface() { - return (accessFlags & JAccessFlags.ACC_INTERFACE) != 0; - } - - public void addField(JField field) { - assert !frozen; - fields.add(field); - } - - /** - * Create and add a new field to the class. - */ - public JField addNewField(int accessFlags, String name, JType type) { - assert !frozen; - JField f = context.JField(this, accessFlags, name, type); - addField(f); - return f; - } - - protected void addMethod(JMethod method) { - assert !frozen; - methods.add(method); - } - - /** - * Create and add a new method to the class. - */ - public JMethod addNewMethod(int accessFlags, - String name, - JType returnType, - JType[] argTypes, - String[] argNames) { - assert !frozen; - JMethod m = context.JMethod(this, - accessFlags, - name, - returnType, - argTypes, - argNames); - addMethod(m); - return m; - } - - /** - * Remove a previously-added method. This makes no attempt at - * minimising the constant pool by removing all constants which - * were used only by this method. - */ - public void removeMethod(JMethod m) { - assert !frozen; - methods.remove(m); - } - - public JField[] getFields() { - return (JField[])fields.toArray(new JField[fields.size()]); - } - - public JMethod[] getMethods() { - return (JMethod[])methods.toArray(new JMethod[methods.size()]); - } - - /** - * Freeze the contents of this class so that it can be written to - * a file. - */ - public void freeze() { - assert !frozen; - frozen = true; - } - - /** - * Writes the contents of the class to a file referenced by its name. - * @param fileName The name of the file in which the class must be written. - */ - public void writeTo(String fileName) throws IOException { - writeTo(new File(fileName)); - } - - /** - * Writes the contents of the class to a file. - * @param file The file in which the class must be written. - */ - public void writeTo(File file) throws IOException { - File parent = file.getParentFile(); - if (parent != null && !parent.isDirectory()) - if (!parent.mkdirs()) - throw new IOException("cannot create directory " + parent); - - FileOutputStream fStream = new FileOutputStream(file); - BufferedOutputStream bStream = new BufferedOutputStream(fStream); - DataOutputStream dStream = new DataOutputStream(bStream); - writeTo(dStream); - dStream.close(); - bStream.close(); - fStream.close(); - } - - /** - * Writes the contents of the class to a data stream. - * @param stream The data stream in which the class must be written. - */ - public void writeTo(DataOutputStream stream) throws IOException { - if (!frozen) freeze(); - - int thisClassIdx = pool.addClass(name); - int superClassIdx = pool.addClass(superclassName); - int[] interfacesIdx = new int[interfaceNames.length]; - - for (int i = 0; i < interfaceNames.length; ++i) - interfacesIdx[i] = pool.addClass(interfaceNames[i]); - - pool.freeze(); - - // Magic number. - stream.writeInt(MAGIC_NUMBER); - // Version - stream.writeShort(minor); - stream.writeShort(major); - // Constant pool - pool.writeTo(stream); - // Access flags - stream.writeShort(accessFlags); - - // This class, super class and interfaces - stream.writeShort(thisClassIdx); - stream.writeShort(superClassIdx); - stream.writeShort(interfacesIdx.length); - for (int i = 0; i < interfacesIdx.length; ++i) - stream.writeShort(interfacesIdx[i]); - - // Fields and methods - stream.writeShort(fields.size()); - Iterator fieldsIt = fields.iterator(); - while (fieldsIt.hasNext()) - ((JField)fieldsIt.next()).writeTo(stream); - - stream.writeShort(methods.size()); - Iterator methodsIt = methods.iterator(); - while (methodsIt.hasNext()) - ((JMethod)methodsIt.next()).writeTo(stream); - - // Attributes - JAttribute.writeTo(attributes, stream); - } - - // Follows javap output format for ClassFile. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(); - if (sourceFileName != null) { - buf.append("Compiled from \""); - buf.append(sourceFileName); - buf.append("\"\n"); - } - buf.append(getMemberName()); - buf.append(toExternalName(getName())); - if (!isInterface()) { - buf.append(" extends "); - buf.append(toExternalName(getSuperclassName())); - } - if (interfaceNames.length > 0) { - if (isInterface()) buf.append(" extends "); - else buf.append(" implements "); - for (int i = 0; i < interfaceNames.length; ++i) { - if (i > 0) buf.append(","); - buf.append(toExternalName(interfaceNames[i])); - } - } - buf.append("\n"); - Iterator attrsIt = attributes.iterator(); - while (attrsIt.hasNext()) { - JAttribute attr = (JAttribute)attrsIt.next(); - buf.append(attr); - } - buf.append(" minor version: "); - buf.append(minor); - buf.append("\n major version: "); - buf.append(major); - buf.append("\n"); - buf.append(pool); - buf.append("\n{\n"); - JField[] jfields = getFields(); - for (int i = 0; i < jfields.length; ++i) { - if (i > 0) buf.append("\n"); - buf.append(jfields[i]); - } - buf.append("\n"); - JMethod[] jmethods = getMethods(); - for (int i = 0; i < jmethods.length; ++i) { - if (i > 0) buf.append("\n"); - buf.append(jmethods[i]); - } - buf.append("\n}\n"); - return buf.toString(); - } - - private String getMemberName() { - StringBuffer buf = new StringBuffer(); - if (isPublic()) buf.append("public "); - else if (isProtected()) buf.append("protected "); - else if (isPrivate()) buf.append("private "); - if (isInterface()) - buf.append("interface "); - else { - if (isAbstract()) buf.append("abstract "); - else if (isFinal()) buf.append("final "); - buf.append("class "); - } - return buf.toString(); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JCode.java b/src/fjbg/ch/epfl/lamp/fjbg/JCode.java deleted file mode 100644 index ab6934ab30..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JCode.java +++ /dev/null @@ -1,1308 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.*; - -import ch.epfl.lamp.util.ByteArray; - -/** - * List of instructions, to which Java byte-code instructions can be added. - * - * @author Michel Schinz, Thomas Friedli - * @version 1.0 - */ - -public class JCode { - protected boolean frozen = false; - - public static int MAX_CODE_SIZE = 65535; - - protected final FJBGContext context; - protected final JMethod owner; - - protected final ByteArray codeArray; - - protected final LinkedList/*<ExceptionHandler>*/ exceptionHandlers = - new LinkedList(); - - protected final JConstantPool pool; - - protected final ArrayList/*<OffsetToPatch>*/ offsetToPatch = - new ArrayList(); - - protected static int UNKNOWN_STACK_SIZE = Integer.MIN_VALUE; - protected int maxStackSize = UNKNOWN_STACK_SIZE; - protected int[] stackProduction = null; - protected int[] stackSizes; - - protected JCode(FJBGContext context, JClass clazz, JMethod owner) { - this.context = context; - this.pool = clazz.getConstantPool(); - this.owner = owner; - this.codeArray = new ByteArray(); - } - - protected JCode(FJBGContext context, - JClass clazz, - JMethod owner, - DataInputStream stream) - throws IOException { - this.context = context; - this.pool = clazz.getConstantPool(); - this.owner = owner; - owner.setCode(this); - int size = stream.readInt(); - if (size > MAX_CODE_SIZE) // section 4.10 - throw new Error("code size must be less than " + MAX_CODE_SIZE + ": " + size); - this.codeArray = new ByteArray(stream, size); - } - - /** - * Gets the program counter, which is defined as the address of the - * next instruction. - * @return The int representing the value of the program counter - */ - public int getPC() { - return codeArray.getSize(); - } - - /** - * Gets the size of the code - * @return The number of bytes of the code - */ - public int getSize() { - return codeArray.getSize(); - } - - /** - * Gets the method to which the code belongs - * @return The method to which the code belongs - */ - public JMethod getOwner() { - return owner; - } - - // Stack size - public int getMaxStackSize() { - if (maxStackSize == UNKNOWN_STACK_SIZE) - maxStackSize = computeMaxStackSize(); - return maxStackSize; - } - - // Freezing - ////////////////////////////////////////////////////////////////////// - - public static class CodeSizeTooBigException extends OffsetTooBigException { - public int codeSize; - - public CodeSizeTooBigException(int size) { - codeSize = size; - } - } - - public void freeze() throws OffsetTooBigException { - assert !frozen; - - if (getSize() > MAX_CODE_SIZE) throw new CodeSizeTooBigException(getSize()); - - patchAllOffset(); - codeArray.freeze(); - frozen = true; - } - - // Attributes - ////////////////////////////////////////////////////////////////////// - - protected final LinkedList/*<JAttribute>*/ attributes = new LinkedList(); - - public void addAttribute(JAttribute attr) { - attributes.add(attr); - } - - public List/*<JAttribute>*/ getAttributes() { - return attributes; - } - - // Emitting code - ////////////////////////////////////////////////////////////////////// - - public void emit(JOpcode opcode) { - setStackProduction(getPC(), opcode); - codeArray.addU1(opcode.code); - } - - public void emitNOP() { emit(JOpcode.NOP); } - - // Constant loading. - public void emitACONST_NULL() { emit(JOpcode.ACONST_NULL); } - public void emitICONST_M1() { emit(JOpcode.ICONST_M1); } - public void emitICONST_0() { emit(JOpcode.ICONST_0); } - public void emitICONST_1() { emit(JOpcode.ICONST_1); } - public void emitICONST_2() { emit(JOpcode.ICONST_2); } - public void emitICONST_3() { emit(JOpcode.ICONST_3); } - public void emitICONST_4() { emit(JOpcode.ICONST_4); } - public void emitICONST_5() { emit(JOpcode.ICONST_5); } - public void emitLCONST_0() { emit(JOpcode.LCONST_0); } - public void emitLCONST_1() { emit(JOpcode.LCONST_1); } - public void emitFCONST_0() { emit(JOpcode.FCONST_0); } - public void emitFCONST_1() { emit(JOpcode.FCONST_1); } - public void emitFCONST_2() { emit(JOpcode.FCONST_2); } - public void emitDCONST_0() { emit(JOpcode.DCONST_0); } - public void emitDCONST_1() { emit(JOpcode.DCONST_1); } - - public void emitBIPUSH(int b) { emitU1(JOpcode.BIPUSH, b); } - public void emitSIPUSH(int s) { emitU2(JOpcode.SIPUSH, s); } - public void emitLDC(int value) { - emitU1(JOpcode.LDC, pool.addInteger(value)); - } - public void emitLDC(float value) { - emitU1(JOpcode.LDC, pool.addFloat(value)); - } - public void emitLDC(String value) { - emitU1(JOpcode.LDC, pool.addString(value)); - } - public void emitLDC_W(int value) { - emitU1(JOpcode.LDC_W, pool.addInteger(value)); - } - public void emitLDC_W(float value) { - emitU1(JOpcode.LDC_W, pool.addFloat(value)); - } - public void emitLDC_W(String value) { - emitU1(JOpcode.LDC_W, pool.addString(value)); - } - public void emitLDC2_W(long value) { - emitU2(JOpcode.LDC2_W, pool.addLong(value)); - } - public void emitLDC2_W(double value) { - emitU2(JOpcode.LDC2_W, pool.addDouble(value)); - } - - // Loading variables. - public void emitILOAD(int index) { emitU1(JOpcode.ILOAD, index); } - public void emitLLOAD(int index) { emitU1(JOpcode.LLOAD, index); } - public void emitFLOAD(int index) { emitU1(JOpcode.FLOAD, index); } - public void emitDLOAD(int index) { emitU1(JOpcode.DLOAD, index); } - public void emitALOAD(int index) { emitU1(JOpcode.ALOAD, index); } - - public void emitILOAD_0() { emit(JOpcode.ILOAD_0); } - public void emitILOAD_1() { emit(JOpcode.ILOAD_1); } - public void emitILOAD_2() { emit(JOpcode.ILOAD_2); } - public void emitILOAD_3() { emit(JOpcode.ILOAD_3); } - public void emitLLOAD_0() { emit(JOpcode.LLOAD_0); } - public void emitLLOAD_1() { emit(JOpcode.LLOAD_1); } - public void emitLLOAD_2() { emit(JOpcode.LLOAD_2); } - public void emitLLOAD_3() { emit(JOpcode.LLOAD_3); } - public void emitFLOAD_0() { emit(JOpcode.FLOAD_0); } - public void emitFLOAD_1() { emit(JOpcode.FLOAD_1); } - public void emitFLOAD_2() { emit(JOpcode.FLOAD_2); } - public void emitFLOAD_3() { emit(JOpcode.FLOAD_3); } - public void emitDLOAD_0() { emit(JOpcode.DLOAD_0); } - public void emitDLOAD_1() { emit(JOpcode.DLOAD_1); } - public void emitDLOAD_2() { emit(JOpcode.DLOAD_2); } - public void emitDLOAD_3() { emit(JOpcode.DLOAD_3); } - public void emitALOAD_0() { emit(JOpcode.ALOAD_0); } - public void emitALOAD_1() { emit(JOpcode.ALOAD_1); } - public void emitALOAD_2() { emit(JOpcode.ALOAD_2); } - public void emitALOAD_3() { emit(JOpcode.ALOAD_3); } - - public void emitIALOAD() { emit(JOpcode.IALOAD); } - public void emitLALOAD() { emit(JOpcode.LALOAD); } - public void emitFALOAD() { emit(JOpcode.FALOAD); } - public void emitDALOAD() { emit(JOpcode.DALOAD); } - public void emitAALOAD() { emit(JOpcode.AALOAD); } - public void emitBALOAD() { emit(JOpcode.BALOAD); } - public void emitCALOAD() { emit(JOpcode.CALOAD); } - public void emitSALOAD() { emit(JOpcode.SALOAD); } - - // Storing variables. - public void emitISTORE(int index) { emitU1(JOpcode.ISTORE, index); } - public void emitLSTORE(int index) { emitU1(JOpcode.LSTORE, index); } - public void emitFSTORE(int index) { emitU1(JOpcode.FSTORE, index); } - public void emitDSTORE(int index) { emitU1(JOpcode.DSTORE, index); } - public void emitASTORE(int index) { emitU1(JOpcode.ASTORE, index); } - - public void emitISTORE_0() { emit(JOpcode.ISTORE_0); } - public void emitISTORE_1() { emit(JOpcode.ISTORE_1); } - public void emitISTORE_2() { emit(JOpcode.ISTORE_2); } - public void emitISTORE_3() { emit(JOpcode.ISTORE_3); } - public void emitLSTORE_0() { emit(JOpcode.LSTORE_0); } - public void emitLSTORE_1() { emit(JOpcode.LSTORE_1); } - public void emitLSTORE_2() { emit(JOpcode.LSTORE_2); } - public void emitLSTORE_3() { emit(JOpcode.LSTORE_3); } - public void emitFSTORE_0() { emit(JOpcode.FSTORE_0); } - public void emitFSTORE_1() { emit(JOpcode.FSTORE_1); } - public void emitFSTORE_2() { emit(JOpcode.FSTORE_2); } - public void emitFSTORE_3() { emit(JOpcode.FSTORE_3); } - public void emitDSTORE_0() { emit(JOpcode.DSTORE_0); } - public void emitDSTORE_1() { emit(JOpcode.DSTORE_1); } - public void emitDSTORE_2() { emit(JOpcode.DSTORE_2); } - public void emitDSTORE_3() { emit(JOpcode.DSTORE_3); } - public void emitASTORE_0() { emit(JOpcode.ASTORE_0); } - public void emitASTORE_1() { emit(JOpcode.ASTORE_1); } - public void emitASTORE_2() { emit(JOpcode.ASTORE_2); } - public void emitASTORE_3() { emit(JOpcode.ASTORE_3); } - - public void emitIASTORE() { emit(JOpcode.IASTORE); } - public void emitLASTORE() { emit(JOpcode.LASTORE); } - public void emitFASTORE() { emit(JOpcode.FASTORE); } - public void emitDASTORE() { emit(JOpcode.DASTORE); } - public void emitAASTORE() { emit(JOpcode.AASTORE); } - public void emitBASTORE() { emit(JOpcode.BASTORE); } - public void emitCASTORE() { emit(JOpcode.CASTORE); } - public void emitSASTORE() { emit(JOpcode.SASTORE); } - - // Stack manipulation. - public void emitPOP() { emit(JOpcode.POP); } - public void emitPOP2() { emit(JOpcode.POP2); } - public void emitDUP() { emit(JOpcode.DUP); } - public void emitDUP_X1() { emit(JOpcode.DUP_X1); } - public void emitDUP_X2() { emit(JOpcode.DUP_X2); } - public void emitDUP2() { emit(JOpcode.DUP2); } - public void emitDUP2_X1() { emit(JOpcode.DUP2_X1); } - public void emitDUP2_X2() { emit(JOpcode.DUP2_X2); } - public void emitSWAP() { emit(JOpcode.SWAP); } - - // Artithmetic and logic operations. - public void emitIADD() { emit(JOpcode.IADD); } - public void emitLADD() { emit(JOpcode.LADD); } - public void emitFADD() { emit(JOpcode.FADD); } - public void emitDADD() { emit(JOpcode.DADD); } - - public void emitISUB() { emit(JOpcode.ISUB); } - public void emitLSUB() { emit(JOpcode.LSUB); } - public void emitFSUB() { emit(JOpcode.FSUB); } - public void emitDSUB() { emit(JOpcode.DSUB); } - - public void emitIMUL() { emit(JOpcode.IMUL); } - public void emitLMUL() { emit(JOpcode.LMUL); } - public void emitFMUL() { emit(JOpcode.FMUL); } - public void emitDMUL() { emit(JOpcode.DMUL); } - - public void emitIDIV() { emit(JOpcode.IDIV); } - public void emitLDIV() { emit(JOpcode.LDIV); } - public void emitFDIV() { emit(JOpcode.FDIV); } - public void emitDDIV() { emit(JOpcode.DDIV); } - - public void emitIREM() { emit(JOpcode.IREM); } - public void emitLREM() { emit(JOpcode.LREM); } - public void emitFREM() { emit(JOpcode.FREM); } - public void emitDREM() { emit(JOpcode.DREM); } - - public void emitINEG() { emit(JOpcode.INEG); } - public void emitLNEG() { emit(JOpcode.LNEG); } - public void emitFNEG() { emit(JOpcode.FNEG); } - public void emitDNEG() { emit(JOpcode.DNEG); } - - public void emitISHL() { emit(JOpcode.ISHL); } - public void emitLSHL() { emit(JOpcode.LSHL); } - - public void emitISHR() { emit(JOpcode.ISHR); } - public void emitLSHR() { emit(JOpcode.LSHR); } - - public void emitIUSHR() { emit(JOpcode.IUSHR); } - public void emitLUSHR() { emit(JOpcode.LUSHR); } - - public void emitIAND() { emit(JOpcode.IAND); } - public void emitLAND() { emit(JOpcode.LAND); } - - public void emitIOR() { emit(JOpcode.IOR); } - public void emitLOR() { emit(JOpcode.LOR); } - - public void emitIXOR() { emit(JOpcode.IXOR); } - public void emitLXOR() { emit(JOpcode.LXOR); } - - public void emitIINC(int index, int increment) { - emitU1U1(JOpcode.IINC, index, increment); - } - - // (Numeric) type conversions. - public void emitI2L() { emit(JOpcode.I2L); } - public void emitI2F() { emit(JOpcode.I2F); } - public void emitI2D() { emit(JOpcode.I2D); } - public void emitL2I() { emit(JOpcode.L2I); } - public void emitL2F() { emit(JOpcode.L2F); } - public void emitL2D() { emit(JOpcode.L2D); } - public void emitF2I() { emit(JOpcode.F2I); } - public void emitF2L() { emit(JOpcode.F2L); } - public void emitF2D() { emit(JOpcode.F2D); } - public void emitD2I() { emit(JOpcode.D2I); } - public void emitD2L() { emit(JOpcode.D2L); } - public void emitD2F() { emit(JOpcode.D2F); } - public void emitI2B() { emit(JOpcode.I2B); } - public void emitI2C() { emit(JOpcode.I2C); } - public void emitI2S() { emit(JOpcode.I2S); } - - // Comparisons and tests. - public void emitLCMP() { emit(JOpcode.LCMP); } - public void emitFCMPL() { emit(JOpcode.FCMPL); } - public void emitFCMPG() { emit(JOpcode.FCMPG); } - public void emitDCMPL() { emit(JOpcode.DCMPL); } - public void emitDCMPG() { emit(JOpcode.DCMPG); } - - protected void emitGenericIF(JOpcode opcode, Label label) - throws OffsetTooBigException { - emitU2(opcode, label.getOffset16(getPC() + 1, getPC())); - } - - public void emitIFEQ(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFEQ, label); - } - public void emitIFEQ(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFEQ, targetPC - getPC()); - } - public void emitIFEQ() { - emitU2(JOpcode.IFEQ, 0); - } - - public void emitIFNE(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFNE, label); - } - public void emitIFNE(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFNE, targetPC - getPC()); - } - public void emitIFNE() { - emitU2(JOpcode.IFNE, 0); - } - - public void emitIFLT(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFLT, label); - } - public void emitIFLT(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFLT, targetPC - getPC()); - } - public void emitIFLT() { - emitU2(JOpcode.IFLT, 0); - } - - public void emitIFGE(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFGE, label); - } - public void emitIFGE(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFGE, targetPC - getPC()); - } - public void emitIFGE() { - emitU2(JOpcode.IFGE, 0); - } - - public void emitIFGT(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFGT, label); - } - public void emitIFGT(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFGT, targetPC - getPC()); - } - public void emitIFGT() { - emitU2(JOpcode.IFGT, 0); - } - - public void emitIFLE(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFLE, label); - } - public void emitIFLE(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFLE, targetPC - getPC()); - } - public void emitIFLE() { - emitU2(JOpcode.IFLE, 0); - } - - public void emitIF_ICMPEQ(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ICMPEQ, label); - } - public void emitIF_ICMPEQ(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ICMPEQ, targetPC - getPC()); - } - public void emitIF_ICMPEQ() { - emitU2(JOpcode.IF_ICMPEQ, 0); - } - - public void emitIF_ICMPNE(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ICMPNE, label); - } - public void emitIF_ICMPNE(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ICMPNE, targetPC - getPC()); - } - public void emitIF_ICMPNE() { - emitU2(JOpcode.IF_ICMPNE, 0); - } - - public void emitIF_ICMPLT(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ICMPLT, label); - } - public void emitIF_ICMPLT(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ICMPLT, targetPC - getPC()); - } - public void emitIF_ICMPLT() { - emitU2(JOpcode.IF_ICMPLT, 0); - } - - public void emitIF_ICMPGE(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ICMPGE, label); - } - public void emitIF_ICMPGE(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ICMPGE, targetPC - getPC()); - } - public void emitIF_ICMPGE() { - emitU2(JOpcode.IF_ICMPGE, 0); - } - - public void emitIF_ICMPGT(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ICMPGT, label); - } - public void emitIF_ICMPGT(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ICMPGT, targetPC - getPC()); - } - public void emitIF_ICMPGT() { - emitU2(JOpcode.IF_ICMPGT, 0); - } - - public void emitIF_ICMPLE(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ICMPLE, label); - } - public void emitIF_ICMPLE(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ICMPLE, targetPC - getPC()); - } - public void emitIF_ICMPLE() { - emitU2(JOpcode.IF_ICMPLE, 0); - } - - public void emitIF_ACMPEQ(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ACMPEQ, label); - } - public void emitIF_ACMPEQ(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ACMPEQ, targetPC - getPC()); - } - public void emitIF_ACMPEQ() { - emitU2(JOpcode.IF_ACMPEQ, 0); - } - - public void emitIF_ACMPNE(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IF_ACMPNE, label); - } - public void emitIF_ACMPNE(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IF_ACMPNE, targetPC - getPC()); - } - public void emitIF_ACMPNE() { - emitU2(JOpcode.IF_ACMPNE, 0); - } - - public void emitIFNULL(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFNULL, label); - } - public void emitIFNULL(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFNULL, targetPC - getPC()); - } - public void emitIFNULL() { - emitU2(JOpcode.IFNULL, 0); - } - - public void emitIFNONNULL(Label label) throws OffsetTooBigException { - emitGenericIF(JOpcode.IFNONNULL, label); - } - public void emitIFNONNULL(int targetPC) throws OffsetTooBigException { - emitU2(JOpcode.IFNONNULL, targetPC - getPC()); - } - public void emitIFNONNULL() { - emitU2(JOpcode.IFNONNULL, 0); - } - - public void emitGOTO(Label label) throws OffsetTooBigException { - emitU2(JOpcode.GOTO, label.getOffset16(getPC() + 1, getPC())); - } - public void emitGOTO(int targetPC) throws OffsetTooBigException { - int offset = targetPC - getPC(); - checkOffset16(offset); - emitU2(JOpcode.GOTO, offset); - } - public void emitGOTO() { - emitU2(JOpcode.GOTO, 0); - } - - public void emitGOTO_W(Label label) { - emitU4(JOpcode.GOTO_W, label.getOffset32(getPC() + 1, getPC())); - } - public void emitGOTO_W(int targetPC) { - emitU4(JOpcode.GOTO_W, targetPC - getPC()); - } - public void emitGOTO_W() { - emitU4(JOpcode.GOTO_W, 0); - } - - public void emitJSR(Label label) throws OffsetTooBigException { - emitU2(JOpcode.JSR, label.getOffset16(getPC() + 1, getPC())); - } - public void emitJSR(int targetPC) { - emitU2(JOpcode.JSR, targetPC - getPC()); - } - public void emitJSR() { - emitU2(JOpcode.JSR, 0); - } - - public void emitJSR_W(Label label) { - emitU4(JOpcode.JSR_W, label.getOffset32(getPC() + 1, getPC())); - } - public void emitJSR_W(int targetPC) { - emitU4(JOpcode.JSR_W, targetPC - getPC()); - } - public void emitJSR_W() { - emitU4(JOpcode.JSR_W, 0); - } - - /* - public void emitRET(Label label) throws OffsetTooBigException { - emitU2(JOpcode.RET, label.getOffset16(getPC() + 1, getPC())); - } - public void emitRET(int targetPC) { - emitU1(JOpcode.RET, targetPC); - } - public void emitRET() { - emitU1(JOpcode.RET, 0); - } - */ - - public void emitRET(int index) { - emitU1(JOpcode.RET, index); - } - - public void emitRET(JLocalVariable var) { - emitRET(var.getIndex()); - } - - public void emitTABLESWITCH(int[] keys, - Label[] branches, - Label defaultBranch) { - assert keys.length == branches.length; - - int low = keys[0], high = keys[keys.length - 1]; - int instrPC = getPC(); - - setStackProduction(instrPC, JOpcode.TABLESWITCH); - codeArray.addU1(JOpcode.cTABLESWITCH); - while (getPC() % 4 != 0) codeArray.addU1(0); - - codeArray.addU4(defaultBranch.getOffset32(getPC(), instrPC)); - codeArray.addU4(low); - codeArray.addU4(high); - for (int i = 0; i < branches.length; i++) { - assert keys[i] == low + i; - codeArray.addU4(branches[i].getOffset32(getPC(), instrPC)); - } - } - - public void emitLOOKUPSWITCH(int[] keys, - Label[] branches, - Label defaultBranch) { - assert keys.length == branches.length; - - int instrPC = getPC(); - setStackProduction(getPC(), JOpcode.LOOKUPSWITCH); - codeArray.addU1(JOpcode.cLOOKUPSWITCH); - while (getPC() % 4 != 0) codeArray.addU1(0); - - codeArray.addU4(defaultBranch.getOffset32(getPC(), instrPC)); - codeArray.addU4(branches.length); - for (int i = 0; i < branches.length; i++) { - codeArray.addU4(keys[i]); - codeArray.addU4(branches[i].getOffset32(getPC(), instrPC)); - } - } - - public void emitIRETURN() { emit(JOpcode.IRETURN); } - public void emitLRETURN() { emit(JOpcode.LRETURN); } - public void emitFRETURN() { emit(JOpcode.FRETURN); } - public void emitDRETURN() { emit(JOpcode.DRETURN); } - public void emitARETURN() { emit(JOpcode.ARETURN); } - public void emitRETURN() { emit(JOpcode.RETURN); } - - // Field access - public void emitGETSTATIC(String className, String name, JType type) { - setStackProduction(getPC(), type.getSize()); - int index = pool.addFieldRef(className, name, type.getSignature()); - emitU2(JOpcode.GETSTATIC, index); - } - public void emitPUTSTATIC(String className, String name, JType type) { - setStackProduction(getPC(), -type.getSize()); - int index = pool.addFieldRef(className, name, type.getSignature()); - emitU2(JOpcode.PUTSTATIC, index); - } - public void emitGETFIELD(String className, String name, JType type) { - setStackProduction(getPC(), type.getSize() - 1); - int index = pool.addFieldRef(className, name, type.getSignature()); - emitU2(JOpcode.GETFIELD, index); - } - public void emitPUTFIELD(String className, String name, JType type) { - setStackProduction(getPC(), -(type.getSize() + 1)); - int index = pool.addFieldRef(className, name, type.getSignature()); - emitU2(JOpcode.PUTFIELD, index); - } - - // Method invocation - public void emitINVOKEVIRTUAL(String className, - String name, - JMethodType type) { - setStackProduction(getPC(), type.getProducedStack() - 1); - int index = - pool.addClassMethodRef(className, name, type.getSignature()); - emitU2(JOpcode.INVOKEVIRTUAL, index); - } - public void emitINVOKESPECIAL(String className, - String name, - JMethodType type) { - setStackProduction(getPC(), type.getProducedStack() - 1); - int index = - pool.addClassMethodRef(className, name, type.getSignature()); - emitU2(JOpcode.INVOKESPECIAL, index); - } - public void emitINVOKESTATIC(String className, - String name, - JMethodType type) { - setStackProduction(getPC(), type.getProducedStack()); - int index = - pool.addClassMethodRef(className, name, type.getSignature()); - emitU2(JOpcode.INVOKESTATIC, index); - } - public void emitINVOKEINTERFACE(String className, - String name, - JMethodType type) { - setStackProduction(getPC(), type.getProducedStack() - 1); - int index = - pool.addInterfaceMethodRef(className, name, type.getSignature()); - emitU2U1U1(JOpcode.INVOKEINTERFACE, index, type.getArgsSize() + 1, 0); - } - - // Object creation - public void emitNEW(String className) { - emitU2(JOpcode.NEW, pool.addClass(className)); - } - public void emitNEWARRAY(JType elemType) { - emitU1(JOpcode.NEWARRAY, elemType.getTag()); - } - public void emitANEWARRAY(JReferenceType elemType) { - emitU2(JOpcode.ANEWARRAY, pool.addDescriptor(elemType)); - } - public void emitMULTIANEWARRAY(JReferenceType elemType, int dimensions) { - setStackProduction(getPC(), -dimensions + 1); - emitU2U1(JOpcode.MULTIANEWARRAY, - pool.addDescriptor(elemType), - dimensions); - } - public void emitARRAYLENGTH() { emit(JOpcode.ARRAYLENGTH); } - - // Exception throwing - public void emitATHROW() { emit(JOpcode.ATHROW); } - - // Dynamic typing - public void emitCHECKCAST(JReferenceType type) { - emitU2(JOpcode.CHECKCAST, pool.addDescriptor(type)); - } - public void emitINSTANCEOF(JReferenceType type) { - emitU2(JOpcode.INSTANCEOF, pool.addDescriptor(type)); - } - - // Monitors - public void emitMONITORENTER() { emit(JOpcode.MONITORENTER); } - public void emitMONITOREXIT() { emit(JOpcode.MONITOREXIT); } - - // Wide variants - // FIXME setStackProd. will here raise an exception - public void emitWIDE(JOpcode opcode, int index) { - assert (opcode.code == JOpcode.cILOAD) - || (opcode.code == JOpcode.cLLOAD) - || (opcode.code == JOpcode.cFLOAD) - || (opcode.code == JOpcode.cDLOAD) - || (opcode.code == JOpcode.cALOAD) - || (opcode.code == JOpcode.cISTORE) - || (opcode.code == JOpcode.cLSTORE) - || (opcode.code == JOpcode.cFSTORE) - || (opcode.code == JOpcode.cDSTORE) - || (opcode.code == JOpcode.cASTORE) - || (opcode.code == JOpcode.cRET) - : "invalide opcode for WIDE: " + opcode; - - setStackProduction(getPC(), opcode); - codeArray.addU1(JOpcode.WIDE.code); - codeArray.addU1(opcode.code); - codeArray.addU2(index); - } - public void emitWIDE(JOpcode opcode, int index, int constant) { - assert opcode.code == JOpcode.cIINC - : "invalid opcode for WIDE: " + opcode; - - setStackProduction(getPC(), opcode); - codeArray.addU1(JOpcode.cWIDE); - codeArray.addU1(opcode.code); - codeArray.addU2(index); - codeArray.addU2(constant); - } - - protected void emitU1(JOpcode opcode, int i1) { - setStackProduction(getPC(), opcode); - codeArray.addU1(opcode.code); - codeArray.addU1(i1); - } - - protected void emitU1U1(JOpcode opcode, int i1, int i2) { - setStackProduction(getPC(), opcode); - codeArray.addU1(opcode.code); - codeArray.addU1(i1); - codeArray.addU1(i2); - } - - protected void emitU2(JOpcode opcode, int i1) { - setStackProduction(getPC(), opcode); - codeArray.addU1(opcode.code); - codeArray.addU2(i1); - } - - protected void emitU2U1(JOpcode opcode, int i1, int i2) { - setStackProduction(getPC(), opcode); - codeArray.addU1(opcode.code); - codeArray.addU2(i1); - codeArray.addU1(i2); - } - - protected void emitU2U1U1(JOpcode opcode, int i1, int i2, int i3) { - setStackProduction(getPC(), opcode); - codeArray.addU1(opcode.code); - codeArray.addU2(i1); - codeArray.addU1(i2); - codeArray.addU1(i3); - } - - protected void emitU4(JOpcode opcode, int i1) { - setStackProduction(getPC(), opcode); - codeArray.addU1(opcode.code); - codeArray.addU4(i1); - } - - protected int getU1(int sourcePos) { - return codeArray.getU1(sourcePos); - } - - protected int getU2(int sourcePos) { - return codeArray.getU2(sourcePos); - } - - protected int getU4(int sourcePos) { - return codeArray.getU4(sourcePos); - } - - protected int getS1(int sourcePos) { - return codeArray.getS1(sourcePos); - } - - protected int getS2(int sourcePos) { - return codeArray.getS2(sourcePos); - } - - protected int getS4(int sourcePos) { - return codeArray.getS4(sourcePos); - } - - // Stack size computation - ////////////////////////////////////////////////////////////////////// - - protected int getStackProduction(int pc) { - if (stackProduction == null || pc >= stackProduction.length) - return UNKNOWN_STACK_SIZE; - else - return stackProduction[pc]; - } - - protected void setStackProduction(int pc, int production) { - if (stackProduction == null) { - stackProduction = new int[256]; - Arrays.fill(stackProduction, UNKNOWN_STACK_SIZE); - } else { - while (pc >= stackProduction.length) { - int[] newStackProduction = new int[stackProduction.length * 2]; - System.arraycopy(stackProduction, 0, - newStackProduction, 0, - stackProduction.length); - Arrays.fill(newStackProduction, - stackProduction.length, - newStackProduction.length, - UNKNOWN_STACK_SIZE); - stackProduction = newStackProduction; - } - } - stackProduction[pc] = production; - } - - protected void setStackProduction(int pc, JOpcode opcode) { - // TODO we should instead check whether the opcode has known - // stack consumption/production. - if (getStackProduction(pc) == UNKNOWN_STACK_SIZE) -// && opcode.hasKnownProducedDataSize() -// && opcode.hasKnownConsumedDataSize()) - setStackProduction(pc, - opcode.getProducedDataSize() - - opcode.getConsumedDataSize()); - } - - protected int computeMaxStackSize() { - if (stackSizes == null) { - stackSizes = new int[getSize()]; - Arrays.fill(stackSizes, UNKNOWN_STACK_SIZE); - stackSizes[0] = 0; - } - int size = computeMaxStackSize(0, 0, 0); - - // compute stack sizes for exception handlers too - ExceptionHandler exh = null; - for (Iterator it = exceptionHandlers.iterator(); - it.hasNext();) { - exh = (ExceptionHandler)it.next(); - int exhSize = computeMaxStackSize(exh.getHandlerPC(), 1, 1); - if (size < exhSize) - size = exhSize; - } - - return size; - } - - protected int computeMaxStackSize(int pc, int stackSize, int maxStackSize) { - JCodeIterator iterator = new JCodeIterator(this, pc); - for (;;) { - int successors = iterator.getSuccessorCount(); - if (successors == 0) - return maxStackSize; - else { - assert stackProduction[iterator.getPC()] != UNKNOWN_STACK_SIZE - : "unknown stack production, pc=" + iterator.getPC() - + " in method " + owner.getName(); - stackSize += stackProduction[iterator.getPC()]; - if (stackSize > maxStackSize) - maxStackSize = stackSize; - int nextPC = -1; - for (int i = 0; i < successors; ++i) { - int succPC = iterator.getSuccessorPC(i); - assert succPC >= 0 && succPC < stackSizes.length - : iterator.getPC() + ": invalid pc: " + succPC - + " op: " + iterator.getOpcode(); - if (stackSizes[succPC] == UNKNOWN_STACK_SIZE) { - stackSizes[succPC] = stackSize; - if (nextPC == -1) - nextPC = succPC; - else - maxStackSize = computeMaxStackSize(succPC, - stackSize, - maxStackSize); - } - } - if (nextPC == -1) - return maxStackSize; - else - iterator.moveTo(nextPC); - } - } - } - - // Labels - ////////////////////////////////////////////////////////////////////// - - public static class OffsetTooBigException extends Exception { - public OffsetTooBigException() { super(); } - public OffsetTooBigException(String message) { super(message); } - } - - protected void checkOffset16(int offset) throws OffsetTooBigException { - if (offset < Short.MIN_VALUE || offset > Short.MAX_VALUE) - throw new OffsetTooBigException("offset too big to fit" - + " in 16 bits: " + offset); - } - - public class Label { - protected boolean anchored = false; - protected int targetPC = 0; - - public void anchorToNext() { - assert !anchored; - this.targetPC = getPC(); - anchored = true; - } - - public int getAnchor() { - assert anchored; - return targetPC; - } - - protected int getOffset16(int pc, int instrPC) - throws OffsetTooBigException { - if (anchored) { - int offset = targetPC - instrPC; - checkOffset16(offset); - return offset; - } else { - recordOffsetToPatch(pc, 16, instrPC, this); - return 0; - } - } - - protected int getOffset32(int pc, int instrPC) { - if (anchored) - return targetPC - instrPC; - else { - recordOffsetToPatch(pc, 32, instrPC, this); - return 0; - } - } - } - - public Label newLabel() { - return new Label(); - } - - public Label[] newLabels(int count) { - Label[] labels = new Label[count]; - for (int i = 0; i < labels.length; ++i) - labels[i] = newLabel(); - return labels; - } - - protected static class OffsetToPatch { - public final int pc; - public final int size; - public final int instrPC; - public final Label label; - - public OffsetToPatch(int pc, int size, int instrPC, Label label) { - this.pc = pc; - this.size = size; - this.instrPC = instrPC; - this.label = label; - } - } - - protected void recordOffsetToPatch(int offsetPC, - int size, - int instrPC, - Label label) { - offsetToPatch.add(new OffsetToPatch(offsetPC, size, instrPC, label)); - } - - protected void patchAllOffset() throws OffsetTooBigException { - Iterator offsetIt = offsetToPatch.iterator(); - while (offsetIt.hasNext()) { - OffsetToPatch offset = (OffsetToPatch)offsetIt.next(); - int offsetValue = offset.label.getAnchor() - offset.instrPC; - if (offset.size == 16) { - checkOffset16(offsetValue); - codeArray.putU2(offset.pc, offsetValue); - } else - codeArray.putU4(offset.pc, offsetValue); - } - } - - // Exception handling - ////////////////////////////////////////////////////////////////////// - - public class ExceptionHandler { - protected int startPC, endPC, handlerPC; - protected final String catchType; - protected final int catchTypeIndex; - - public void setStartPC(int pc) { - this.startPC = pc; - } - - public int getStartPC() { - return this.startPC; - } - - public void setEndPC(int pc) { - this.endPC = pc; - } - - public int getEndPC() { - return this.endPC; - } - - public void setHandlerPC(int pc) { - this.handlerPC = pc; - } - - public int getHandlerPC() { - return this.handlerPC; - } - - public ExceptionHandler(String catchType) { - this(0, 0, 0, catchType); - } - - public ExceptionHandler(int startPC, - int endPC, - int handlerPC, - String catchType) { - this.startPC = startPC; - this.endPC = endPC; - this.handlerPC = handlerPC; - this.catchType = catchType; - this.catchTypeIndex = (catchType == null - ? 0 - : pool.addClass(catchType)); - } - - public ExceptionHandler(DataInputStream stream) throws IOException { - this.startPC = stream.readShort(); - this.endPC = stream.readShort(); - this.handlerPC = stream.readShort(); - this.catchTypeIndex = stream.readShort(); - this.catchType = (catchTypeIndex == 0 - ? null - : pool.lookupClass(catchTypeIndex)); - } - - public void writeTo(DataOutputStream stream) throws IOException { - stream.writeShort(startPC); - stream.writeShort(endPC); - stream.writeShort(handlerPC); - stream.writeShort(catchTypeIndex); - } - - // Follows javap output format for exception handlers. - /*@Override*/public String toString() { - StringBuffer buf = new StringBuffer(" "); - if (startPC < 10) buf.append(" "); - buf.append(startPC); - buf.append(" "); - if (endPC < 10) buf.append(" "); - buf.append(endPC); - buf.append(" "); - buf.append(handlerPC); - buf.append(" "); - if (catchType != null) { - buf.append("Class "); - buf.append(catchType); - } - else - buf.append("any"); - return buf.toString(); - } - - } - - public void addExceptionHandler(ExceptionHandler handler) { - assert !frozen; - exceptionHandlers.add(handler); - } - - public void addExceptionHandler(int startPC, - int endPC, - int handlerPC, - String catchType) { - addExceptionHandler(new ExceptionHandler(startPC, - endPC, - handlerPC, - catchType)); - } - - public void addFinallyHandler(int startPC, int endPC, int handlerPC) { - assert !frozen; - addExceptionHandler(startPC, endPC, handlerPC, null); - } - - public List/*<ExceptionHandler>*/ getExceptionHandlers() { - return exceptionHandlers; - } - - // Line numbers - ////////////////////////////////////////////////////////////////////// - - protected int[] lineNumbers = null; - protected void ensureLineNumberCapacity(int endPC) { - assert !frozen; - if (lineNumbers == null) { - lineNumbers = new int[endPC]; - addAttribute(context.JLineNumberTableAttribute(owner.getOwner(), - this)); - } else if (lineNumbers.length < endPC) { - int[] newLN = new int[Math.max(endPC, lineNumbers.length * 2)]; - System.arraycopy(lineNumbers, 0, newLN, 0, lineNumbers.length); - lineNumbers = newLN; - } - } - - /** - * Set all line numbers in the interval [startPC, endPC) to - * line, overwriting existing line numbers. - */ - public void setLineNumber(int startPC, int endPC, int line) { - ensureLineNumberCapacity(endPC); - Arrays.fill(lineNumbers, startPC, endPC, line); - } - - public void setLineNumber(int instrPC, int line) { - setLineNumber(instrPC, instrPC + 1, line); - } - - /** Sets all non-filled line numbers in the interval [startPC, endPC) - * to 'line'. - */ - public void completeLineNumber(int startPC, int endPC, int line) { - ensureLineNumberCapacity(endPC); - for (int pc = startPC; pc < endPC; ++pc) - if (lineNumbers[pc] == 0) lineNumbers[pc] = line; - } - - public int[] getLineNumbers() { - assert frozen; - if (lineNumbers == null) return new int[0]; - else if (lineNumbers.length == getPC()) return lineNumbers; - else { - int[] trimmedLN = new int[getPC()]; - System.arraycopy(lineNumbers, 0, - trimmedLN, 0, - Math.min(lineNumbers.length, trimmedLN.length)); - return trimmedLN; - } - } - - // Output - ////////////////////////////////////////////////////////////////////// - - public void writeTo(DataOutputStream stream) throws IOException { - assert frozen; - stream.writeInt(getSize()); - codeArray.writeTo(stream); - } - - // Follows javap output format for opcodes. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(); - JOpcode opcode = null; - int pc = 0, addr = 0; - while (pc < codeArray.getSize()) { - buf.append("\n "); - buf.append(pc); - buf.append(":\t"); - opcode = JOpcode.OPCODES[codeArray.getU1(pc)]; - buf.append(decode(opcode, pc)); - if (opcode.code == JOpcode.cTABLESWITCH || - opcode.code == JOpcode.cLOOKUPSWITCH) { - addr = ((pc / 4 + 1) + 1) * 4; // U4 aligned data - int low = codeArray.getU4(addr); - int high = codeArray.getU4(addr+4); - pc = addr + (2/*low+high*/ + (high - low + 1)/*targets*/) * 4; - } else - pc += opcode.getSize(); - } - if (exceptionHandlers.size() > 0) { - buf.append("\n Exception table:\n from to target type\n"); - Iterator it = exceptionHandlers.iterator(); - while (it.hasNext()) { - ExceptionHandler exh = (ExceptionHandler)it.next(); - buf.append(exh); - buf.append("\n"); - } - } - return buf.toString(); - } - - private String decode(JOpcode opcode, int pc) { - String ownerClassName = owner.getOwner().getName(); - int data, data2; - StringBuilder buf = new StringBuilder(); - buf.append(opcode.name.toLowerCase()); - switch (opcode.code) { - case JOpcode.cALOAD: case JOpcode.cASTORE: case JOpcode.cBIPUSH: - case JOpcode.cDLOAD: case JOpcode.cDSTORE: - case JOpcode.cFLOAD: case JOpcode.cFSTORE: - case JOpcode.cILOAD: case JOpcode.cISTORE: - case JOpcode.cLLOAD: case JOpcode.cLSTORE: - data = codeArray.getU1(pc+1); - buf.append("\t"); - buf.append(data); - break; - case JOpcode.cLDC: - data = codeArray.getU1(pc+1); - buf.append("\t#"); - buf.append(data); - buf.append("; "); - buf.append(pool.lookupEntry(data).toComment(ownerClassName)); - break; - case JOpcode.cNEWARRAY: - data = codeArray.getU1(pc+1); - buf.append(" "); - buf.append(JType.tagToString(data)); - break; - case JOpcode.cIINC: - data = codeArray.getU1(pc+1); - data2 = codeArray.getU1(pc+2); - buf.append("\t"); - buf.append(data); - buf.append(", "); - buf.append(data2); - break; - case JOpcode.cSIPUSH: - data = codeArray.getU2(pc+1); - buf.append("\t"); - buf.append(data); - break; - case JOpcode.cANEWARRAY: case JOpcode.cCHECKCAST: - case JOpcode.cGETFIELD: case JOpcode.cGETSTATIC: - case JOpcode.cINSTANCEOF: - case JOpcode.cINVOKESPECIAL: case JOpcode.cINVOKESTATIC: - case JOpcode.cINVOKEVIRTUAL: - case JOpcode.cLDC_W: case JOpcode.cLDC2_W: case JOpcode.cNEW: - case JOpcode.cPUTFIELD: case JOpcode.cPUTSTATIC: - data = codeArray.getU2(pc+1); - buf.append("\t#"); - buf.append(data); - buf.append("; "); - buf.append(pool.lookupEntry(data).toComment(ownerClassName)); - break; - case JOpcode.cIF_ACMPEQ: case JOpcode.cIF_ACMPNE: - case JOpcode.cIFEQ: case JOpcode.cIFGE: case JOpcode.cIFGT: - case JOpcode.cIFLE: case JOpcode.cIFLT: case JOpcode.cIFNE: - case JOpcode.cIFNONNULL: case JOpcode.cIFNULL: - case JOpcode.cIF_ICMPEQ: case JOpcode.cIF_ICMPGE: - case JOpcode.cIF_ICMPGT: case JOpcode.cIF_ICMPLE: - case JOpcode.cIF_ICMPLT: case JOpcode.cIF_ICMPNE: - data = codeArray.getU2(pc+1); // maybe S2 offset - buf.append("\t"); - buf.append(pc+data); - break; - case JOpcode.cGOTO: - data = codeArray.getS2(pc+1); // always S2 offset - buf.append("\t"); - buf.append(pc+data); - break; - case JOpcode.cINVOKEINTERFACE: - data = codeArray.getU2(pc+1); - data2 = codeArray.getU1(pc+3); - buf.append("\t#"); - buf.append(data); - buf.append(", "); - buf.append(data2); - buf.append("; "); - buf.append(pool.lookupEntry(data).toComment(ownerClassName)); - break; - case JOpcode.cTABLESWITCH: - buf.append("{ //"); - int addr = ((pc / 4 + 1) + 1) * 4; // U4 aligned data - int low = codeArray.getU4(addr); - int high = codeArray.getU4(addr+4); - buf.append(low); - buf.append(" to "); - buf.append(high); - for (int i = low; i <= high; ++i) { - buf.append("\n\t\t"); - buf.append(i); - buf.append(": "); - buf.append(pc+codeArray.getU4(addr+(i-1)*4)); - buf.append(";"); - } - buf.append("\n\t\tdefault: "); - buf.append(pc+codeArray.getU4(addr-4)); - buf.append(" }"); - default: - } - return buf.toString(); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JCodeAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JCodeAttribute.java deleted file mode 100644 index 9f3fcf8c6a..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JCodeAttribute.java +++ /dev/null @@ -1,125 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Iterator; -import java.util.List; - -/** - * Code attribute, containing code of methods. - * - * A Code attribute contains the JVM instructions and auxiliary information - * for a single method, instance initialization method, or class or interface - * initialization method. See section 4.8.3 of the JVM specification. - * - * @author Michel Schinz, Stephane Micheloud - * @version 1.1 - */ - -public class JCodeAttribute extends JAttribute { - protected final JCode code; - protected final JMethod owner; - protected static int UNKNOWN_STACK_SIZE = Integer.MIN_VALUE; - protected final int maxStackSize; - protected final int maxLocals; - - public JCodeAttribute(FJBGContext context, JClass clazz, JMethod owner) { - super(context, clazz); - this.owner = owner; - - this.maxStackSize = UNKNOWN_STACK_SIZE; - this.maxLocals = 0; // unknown - this.code = owner.getCode(); - - assert clazz == owner.getOwner(); - } - - public JCodeAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.owner = (JMethod)owner; - - this.maxStackSize = stream.readShort(); - this.maxLocals = stream.readShort(); - this.code = context.JCode(clazz, (JMethod)owner, stream); - - int handlersCount = stream.readShort(); - for (int i = 0; i < handlersCount; ++i) - code.addExceptionHandler(code.new ExceptionHandler(stream)); - List/*<JAttribute>*/ attributes = - JAttribute.readFrom(context, clazz, code, stream); - Iterator attrIt = attributes.iterator(); - while (attrIt.hasNext()) - code.addAttribute((JAttribute)attrIt.next()); - - assert name.equals(getName()); - } - - public String getName() { return "Code"; } - - // Follows javap output format for Code attribute. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" Code:"); - buf.append("\n Stack="); - buf.append(maxStackSize); - buf.append(", Locals="); - buf.append(maxLocals); - buf.append(", Args_size="); - buf.append(owner.getArgsSize()); - buf.append(code); - buf.append("\n"); - Iterator it = code.getAttributes().iterator(); - while (it.hasNext()) { - JAttribute attr = (JAttribute)it.next(); - buf.append(attr); - buf.append("\n"); - } - return buf.toString(); - } - - protected int getSize() { - int handlersNum = code.getExceptionHandlers().size(); - - int attrsSize = 0; - Iterator attrsIt = code.getAttributes().iterator(); - while (attrsIt.hasNext()) { - JAttribute attr = (JAttribute)attrsIt.next(); - attrsSize += attr.getSize() + 6; - } - - return 2 // max stack - + 2 // max locals - + 4 // code size - + code.getSize() // code - + 2 // exception table size - + 8 * handlersNum // exception table - + 2 // attributes count - + attrsSize; // attributes - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - List/*<ExceptionHandler>*/ handlers = code.getExceptionHandlers(); - - stream.writeShort(code.getMaxStackSize()); - stream.writeShort(owner.getMaxLocals()); - - code.writeTo(stream); - - stream.writeShort(handlers.size()); - Iterator handlerIt = handlers.iterator(); - while (handlerIt.hasNext()) - ((JCode.ExceptionHandler)handlerIt.next()).writeTo(stream); - JAttribute.writeTo(code.getAttributes(), stream); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JCodeIterator.java b/src/fjbg/ch/epfl/lamp/fjbg/JCodeIterator.java deleted file mode 100644 index d09dfd19a4..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JCodeIterator.java +++ /dev/null @@ -1,377 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import ch.epfl.lamp.util.ByteArray; - -/** - * Iterator used to examine the contents of an instruction list. - * - * @author Michel Schinz, Thomas Friedli - * @version 1.0 - */ - -public class JCodeIterator { - protected final JCode code; - protected final JConstantPool pool; - protected final ByteArray codeArray; - - protected int pc; - protected JOpcode opcode; - - /** - * Creates a new code iterator with its instruction list - * and its pc initialized to a given value. - */ - public JCodeIterator(JCode code, int pc) { - this.code = code; - this.pool = code.getOwner().getOwner().getConstantPool(); - this.codeArray = code.codeArray; - this.pc = pc; - setOpcode(); - } - - public JCodeIterator(JCode code) { - this(code, 0); - } - - /** - * Get the current program counter. - * @return The current program counter. - */ - public int getPC() { return pc; } - - /** - * Searches the type of the instruction positionned at the - * current address and updates the current instruction. - */ - protected void setOpcode() { - // TODO : check if the current pc is the beginning - // of an instruction - opcode = isValid() ? JOpcode.OPCODES[codeArray.getU1(pc)] : null; - } - - /** - * Returns the opcode of the current instruction. - * @return The opcode of the current instruction. - */ - public JOpcode getOpcode() { - return opcode; - } - - /** - * Updates the program counter to an given value. - * @param pc The new value of the program counter. - */ - public void moveTo(int pc) { - this.pc = pc; - setOpcode(); - } - - /** - * Check the validity of the iterator. - * @return true iff the iterator points to a valid address. - */ - public boolean isValid() { - return pc < codeArray.getSize(); - } - - /** - * Updates the current instruction with the next one in the - * sense of their position in the code. - */ - public void moveToNext() { - moveTo(pc + getInstructionSize()); - } - - /** - * Updates the current instruction with a specific successor - * of it. - * @param succ The index of the wanted successor in the list of - * the successors of the current instruction. - */ - public void moveToSuccessor(int succ) { - moveTo(getSuccessorPC(succ)); - } - - /** - * Updates the current instruction with the one positionned - * at a given index relatively to the actual program counter - * @param offset The relative position of the instruction - * compared with the position of the current one - */ - public void moveRelatively(int offset) { - moveTo(pc + offset); - } - - /** - * Returns the size in bytes of the current instruction. - * @return The size in bytes of the current instruction. - */ - public int getInstructionSize() { - if (opcode.size != JOpcode.UNKNOWN) { - return opcode.size; - } else if (opcode == JOpcode.TABLESWITCH) { - int lowOffset = 1 + pad4(pc + 1) + 4; - int low = codeArray.getS4(pc + lowOffset); - int high = codeArray.getS4(pc + lowOffset + 4); - return lowOffset + 8 + 4 * (high - low + 1); - } else if (opcode == JOpcode.LOOKUPSWITCH) { - int npairsOffset = 1 + pad4(pc + 1) + 4; - int npairs = codeArray.getS4(pc + npairsOffset); - return npairsOffset + 4 + 8 * npairs; - } else if (opcode == JOpcode.WIDE) { - if (codeArray.getU1(pc + 1) == JOpcode.cIINC) - return 6; - else - return 4; - } else - throw new Error("Unknown size for instruction " + opcode); - } - - /** - * Returns the number of successors of the current instruction. - * @return The number of successors of the current instruction. - */ - public int getSuccessorCount() { - if (opcode.successorCount != JOpcode.UNKNOWN) { - return opcode.successorCount; - } else if (opcode == JOpcode.TABLESWITCH) { - int lowPos = pc + 1 + pad4(pc + 1) + 4; - return 1 // default case - + codeArray.getS4(lowPos + 4) // value of HIGH field - - codeArray.getS4(lowPos) + 1; // value of LOW field - } else if (opcode == JOpcode.LOOKUPSWITCH) { - int npairsPos = pc + 1 + pad4(pc + 1) + 4; - return 1 + codeArray.getS4(npairsPos); - } else - throw new Error("Unknown successors for instruction " + opcode); - } - - /** - * Returns the address of the successor of the current instruction - * given its index in the list of successors of the current - * instruction. - * @param index The index of the wanted successor in the list of - * the successors of the current instruction. - * @return The address of the specific successor. - */ - public int getSuccessorPC(int index) { - assert (index >= 0) && (index < getSuccessorCount()) : index; - - switch (opcode.jumpKind) { - case JOpcode.JMP_NEXT: - return pc + getInstructionSize(); - case JOpcode.JMP_ALWAYS_S2_OFFSET: - return pc + codeArray.getS2(pc + 1); - case JOpcode.JMP_ALWAYS_S4_OFFSET: - return pc + codeArray.getS4(pc + 1); - case JOpcode.JMP_MAYBE_S2_OFFSET: - if (index == 0) - return pc + getInstructionSize(); - else - return pc + codeArray.getS2(pc + 1); - case JOpcode.JMP_TABLE: { - int defaultPos = pc + 1 + pad4(pc + 1); - if (index == 0) - return pc + codeArray.getS4(defaultPos); - else - return pc + codeArray.getS4(defaultPos + 3*4 + 4 * (index - 1)); - } - case JOpcode.JMP_LOOKUP: { - int defaultPos = pc + 1 + pad4(pc + 1); - if (index == 0) - return pc + codeArray.getS4(defaultPos); - else - return pc + codeArray.getS4(defaultPos + 2*4 + 4 + 8 * (index - 1)); - } - default: - throw new Error(); - } - } - - /** - * Returns the total size of data words put on the stack by the current - * instruction. - * @return The total size of data words put on the stack by the current - * instruction. - */ - public int getProducedDataSize() { - if (opcode.getProducedDataTypes() == JOpcode.UNKNOWN_TYPE) { - switch (opcode.code) { - case JOpcode.cLDC: case JOpcode.cLDC_W: case JOpcode.cBALOAD: - return 1; - case JOpcode.cLDC2_W: case JOpcode.cDUP: case JOpcode.cSWAP: - return 2; - case JOpcode.cDUP_X1: - return 3; - case JOpcode.cDUP_X2: case JOpcode.cDUP2: - return 4; - case JOpcode.cDUP2_X1: - return 5; - case JOpcode.cDUP2_X2: - return 6; - case JOpcode.cGETSTATIC: case JOpcode.cGETFIELD: { - JConstantPool.FieldOrMethodRefEntry entry = - (JConstantPool.FieldOrMethodRefEntry) - pool.lookupEntry(codeArray.getU2(pc + 1)); - return JType.parseSignature(entry.getSignature()).getSize(); - } - case JOpcode.cWIDE : { - int op = codeArray.getU1(pc + 1); - if (op >= JOpcode.cILOAD && op <= JOpcode.cALOAD) { - JOpcode opcode2 = JOpcode.OPCODES[op]; - return JType.getTotalSize(opcode2.getProducedDataTypes()); - } else if (op >= JOpcode.cISTORE && op <= JOpcode.cASTORE) - return 0; - else return 0; // (IINC) - } - default : - throw new Error(opcode.toString()); - } - } else - return JType.getTotalSize(opcode.getProducedDataTypes()); - } - - /** - * Returns the total size of data words taken from the stack by the current - * instruction. - * @return The total size of data words taken from the stack by the current - * instruction. - */ - public int getConsumedDataSize() { - if (opcode.getConsumedDataTypes() != JOpcode.UNKNOWN_TYPE) - return JType.getTotalSize(opcode.getConsumedDataTypes()); - else { - switch (opcode.code) { - case JOpcode.cPOP: case JOpcode.cDUP: - return 1; - case JOpcode.cPOP2: case JOpcode.cSWAP: - case JOpcode.cDUP_X1: case JOpcode.cDUP2: - return 2; - case JOpcode.cDUP_X2: case JOpcode.cDUP2_X1: - return 3; - case JOpcode.cDUP2_X2: - return 4; - case JOpcode.cPUTSTATIC: case JOpcode.cPUTFIELD: { - JConstantPool.FieldOrMethodRefEntry entry = - (JConstantPool.FieldOrMethodRefEntry) - pool.lookupEntry(codeArray.getU2(pc + 1)); - return JType.parseSignature(entry.getSignature()).getSize(); - } - case JOpcode.cINVOKEVIRTUAL: case JOpcode.cINVOKESPECIAL: - case JOpcode.cINVOKESTATIC: case JOpcode.cINVOKEINTERFACE : { - JConstantPool.FieldOrMethodRefEntry entry = - (JConstantPool.FieldOrMethodRefEntry) - pool.lookupEntry(codeArray.getU2(pc + 1)); - JMethodType tp = (JMethodType) - JType.parseSignature(entry.getSignature()); - return tp.getArgsSize() - + (opcode == JOpcode.INVOKESTATIC ? 0 : 1); - } - case JOpcode.cWIDE : { - int op = codeArray.getU1(pc + 1); - if (op >= JOpcode.cILOAD && op <= JOpcode.cALOAD) - return 0; - else if (op >= JOpcode.cISTORE && op <= JOpcode.cASTORE) { - JOpcode opcode2 = JOpcode.OPCODES[op]; - return JType.getTotalSize(opcode2.getConsumedDataTypes()); - } else - return 0; // (IINC) - } - case JOpcode.cMULTIANEWARRAY : - return codeArray.getU1(pc + 3); - default: - throw new Error(opcode.toString()); - } - } - } - - /** - * Returns the number of data types put on the stack by the current - * instruction. - * @return The number of data types put on the stack by the current - * instruction. - */ - public int getProducedDataTypesNumber() { - if (opcode.getProducedDataTypes() != JOpcode.UNKNOWN_TYPE) - return opcode.getProducedDataTypes().length; - else { - switch (opcode.code) { - case JOpcode.cLDC: case JOpcode.cLDC_W: case JOpcode.cLDC2_W: - case JOpcode.cBALOAD: case JOpcode.cGETSTATIC: - case JOpcode.cGETFIELD: - return 1; - case JOpcode.cDUP: case JOpcode.cSWAP: - return 2; - case JOpcode.cDUP_X1: - return 3; - case JOpcode.cWIDE: { - int op = codeArray.getU1(pc + 1); - if (op >= JOpcode.cILOAD && op <= JOpcode.cALOAD) - return 1; - else if (op >= JOpcode.cISTORE && op <= JOpcode.cASTORE) - return 0; - else - return 0; // (IINC) - } - default: - throw new Error("JOpcode implementation error"); - } - } - } - - /** - * Returns the number of data types taken from the stack by the current - * instruction. - * @return The number of data types taken from the stack by the current - * instruction. - */ -// public int getConsumedDataTypesNumber() { -// if (opcode.getConsumedDataTypes() == JOpcode.UNKNOWN_TYPE) { -// switch (opcode.code) { -// case 87 : return 1; // POP -// case 88 : return 2; // POP2 -// case 89 : return 1; // DUP -// case 90 : return 2; // DUP_X1 -// case 91 : // DUP_X2 -// case 92 : // DUP2 -// case 93 : // DUP2_X1 -// case 94 : // DUP2_X2 -// throw new UnsupportedOperationException("Opcode " + opcode.name -// + " has a stack-dependant" -// + " data types consumption"); -// case 95 : return 2; // SWAP -// case 179 : return 1; // PUTSTATIC -// case 181 : return 1; // PUTFIELD -// case 182 : // INVOKEVIRTUAL -// case 183 : // INVOKESPECIAL -// case 185 : // INVOKEINTERFACE -// s = epool.getClassMethodRef(codeArray.getU2(pc + 1)).split(" ")[3]; -// return ((JMethodType)JType.parseSignature(s)).argTypes.length + 1; -// case 184 : // INVOKESTATIC -// s = epool.getClassMethodRef(codeArray.getU2(pc + 1)).split(" ")[3]; -// return ((JMethodType)JType.parseSignature(s)).argTypes.length; -// case 196 : // WIDE -// int op = codeArray.getU1(pc + 1); -// if (op >= 21 && op <= 25) return 0; // (xLOAD) -// else if (op >= 54 && op <= 58) // (xSTORE) -// return JOpcode.OPCODES[op].getConsumedDataTypes().length; -// else return 0; // (IINC) -// case 197 : return codeArray.getU1(pc + 3); // MULTIANEWARRAY -// default : throw new Error("JOpcode implementation error"); -// } -// } else return opcode.getConsumedDataTypes().length; -// } - - - // Return the number between 0 and 3 which, if added to the given - // value, would yield a multiple of 4. - protected int[] padding = { 0, 3, 2, 1 }; - protected int pad4(int value) { - return padding[value % 4]; - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JConstantPool.java b/src/fjbg/ch/epfl/lamp/fjbg/JConstantPool.java deleted file mode 100644 index 9867e01b25..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JConstantPool.java +++ /dev/null @@ -1,771 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashMap; - -/** - * Constant pool, holding constants for a Java class file. - * - * @author Michel Schinz - * @version 2.0 - */ - -public class JConstantPool { - protected boolean frozen = false; - - protected HashMap/*<Entry,Integer>*/ entryToIndex = new HashMap(); - protected Entry[] indexToEntry; - protected int currIndex; - - public static final short CONSTANT_Utf8 = 1; - public static final short CONSTANT_Integer = 3; - public static final short CONSTANT_Float = 4; - public static final short CONSTANT_Long = 5; - public static final short CONSTANT_Double = 6; - public static final short CONSTANT_Class = 7; - public static final short CONSTANT_String = 8; - public static final short CONSTANT_Fieldref = 9; - public static final short CONSTANT_Methodref = 10; - public static final short CONSTANT_InterfaceMethodref = 11; - public static final short CONSTANT_NameAndType = 12; - - protected JConstantPool(FJBGContext context) { - indexToEntry = new Entry[8]; - currIndex = 1; - } - - protected JConstantPool(FJBGContext context, DataInputStream stream) - throws IOException { - int count = stream.readShort(); - indexToEntry = new EntryIndex[count]; - - currIndex = 1; - while (currIndex < count) { - EntryIndex e; - int tag = stream.readByte(); - - switch (tag) { - case CONSTANT_Utf8: - e = new Utf8Entry(stream); - // no duplicates - entryToIndex.put(e, new Integer(currIndex)); - break; - case CONSTANT_Integer: - e = new IntegerEntry(stream); - break; - case CONSTANT_Float: - e = new FloatEntry(stream); - break; - case CONSTANT_Long: - e = new LongEntry(stream); - break; - case CONSTANT_Double: - e = new DoubleEntry(stream); - break; - case CONSTANT_Class: - e = new DescriptorEntryIndex(stream); - break; - case CONSTANT_String: - e = new StringEntryIndex(stream); - break; - case CONSTANT_Fieldref: - case CONSTANT_Methodref: - case CONSTANT_InterfaceMethodref: - e = new FieldOrMethodRefEntryIndex(tag, stream); - break; - case CONSTANT_NameAndType: - e = new NameAndTypeEntryIndex(stream); - break; - default: - throw new IllegalArgumentException("unknown entry in pool: " + tag); - } - indexToEntry[currIndex] = e; - currIndex += e.getSize(); - } - } - - public void freeze() { frozen = true; } - - /** - * Returns a string representing the type of an entry - * knowing its tag - * @param tag The tag representing the type of the - * constant pool entry - */ - public String getEntryType(int tag) { - switch (tag) { - case CONSTANT_Utf8 : return "Utf8"; - case CONSTANT_Integer : return "Integer"; - case CONSTANT_Float : return "Float"; - case CONSTANT_Long : return "Long"; - case CONSTANT_Double : return "Double"; - case CONSTANT_Class : return "Class"; - case CONSTANT_String : return "String"; - case CONSTANT_Fieldref : return "Field"; - case CONSTANT_Methodref : return "Method"; - case CONSTANT_InterfaceMethodref : return "InterfaceMethod"; - case CONSTANT_NameAndType : return "NameAndType"; - default : throw new Error("invalid constant pool tag : " + tag); - } - } - - public int addClass(String className) { - return addDescriptor(className.replace('.', '/')); - } - - public int addDescriptor(JReferenceType type) { - return addDescriptor(type.getDescriptor()); - } - - protected int addDescriptor(String name) { - return addEntry(new DescriptorEntryValue(name)); - } - - public int addClassMethodRef(String className, - String methodName, - String signature) { - return addMethodRef(true, className, methodName, signature); - } - - public int addInterfaceMethodRef(String className, - String methodName, - String signature) { - return addMethodRef(false, className, methodName, signature); - } - - public int addMethodRef(boolean isClass, - String className, - String methodName, - String signature) { - return addEntry(new FieldOrMethodRefEntryValue(isClass - ? CONSTANT_Methodref - : CONSTANT_InterfaceMethodref, - className, - methodName, - signature)); - } - - public int addFieldRef(String className, - String fieldName, - String signature) { - return addEntry(new FieldOrMethodRefEntryValue(CONSTANT_Fieldref, - className, - fieldName, - signature)); - } - - public int addInteger(int value) { - return addEntry(new IntegerEntry(value)); - } - - public int addFloat(float value) { - return addEntry(new FloatEntry(value)); - } - - public int addLong(long value) { - return addEntry(new LongEntry(value)); - } - - public int addDouble(double value) { - return addEntry(new DoubleEntry(value)); - } - - public int addString(String value) { - return addEntry(new StringEntryValue(value)); - } - - public int addNameAndType(String name, String descriptor) { - return addEntry(new NameAndTypeEntryValue(name, descriptor)); - } - - public int addUtf8(String value) { - return addEntry(new Utf8Entry(value)); - } - - public int addUtf8(byte[] value) { - return addEntry(new Utf8Entry(value)); - } - - protected int addEntry(EntryValue e) { - assert !frozen; - Integer idx = (Integer)entryToIndex.get(e); - if (idx != null) - return idx.intValue(); - - e.addChildren(); - - int index = currIndex; - currIndex += e.getSize(); - - entryToIndex.put(e, new Integer(index)); - if (index >= indexToEntry.length) { - Entry[] newI2E = new Entry[indexToEntry.length * 2]; - System.arraycopy(indexToEntry, 0, newI2E, 0, indexToEntry.length); - indexToEntry = newI2E; - } - indexToEntry[index] = e; - return index; - } - - /// Lookup methods - ////////////////////////////////////////////////////////////////////// - - public Entry lookupEntry(int index) { - assert index > 0 && index < currIndex - : "invalid index: " + index; - assert indexToEntry[index] != null - : "invalid index (null contents): " + index; - return indexToEntry[index]; - } - - public String lookupClass(int index) { - DescriptorEntry entry = (DescriptorEntry)lookupEntry(index); - return entry.getValue(); - } - - public String lookupNameAndType(int index) { - NameAndTypeEntry entry = (NameAndTypeEntry)lookupEntry(index); - return entry.getName()+":"+entry.getDescriptor(); - } - - public String lookupUtf8(int index) { - Utf8Entry entry = (Utf8Entry)lookupEntry(index); - return entry.getValue(); - } - - /// Output - ////////////////////////////////////////////////////////////////////// - - public void writeTo(DataOutputStream stream) throws IOException { - if (! frozen) freeze(); - - stream.writeShort(currIndex); - for (int i = 0; i < currIndex; ++i) { - Entry entry = indexToEntry[i]; - if (entry != null) { - stream.writeByte(entry.getTag()); - entry.writeContentsTo(stream); - } - } - } - - // Follows javap output format for constant pool. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" Constant pool:"); - for (int i = 0; i < currIndex; ++i) { - Entry entry = indexToEntry[i]; - if (entry != null) { - if (i > 0) buf.append("\n"); - buf.append("const #"); - buf.append(i); - buf.append(" = "); - buf.append(entry); - } - } - buf.append("\n"); - return buf.toString(); - } - - /// Classes for the various kinds of entries - ////////////////////////////////////////////////////////////////////// - - public interface Entry { - public int getTag(); - - int getSize(); - void writeContentsTo(DataOutputStream stream) throws IOException; - String toComment(String ownerClassName); - } - - protected interface EntryValue extends Entry { - abstract void addChildren(); - } - - protected interface EntryIndex extends Entry { - abstract void fetchChildren(); - } - - abstract protected class ChildlessEntry implements EntryValue, EntryIndex { - public void addChildren() {} - public void fetchChildren() {} - } - - public class IntegerEntry extends ChildlessEntry implements Entry { - private final int value; - public IntegerEntry(int value) { this.value = value; } - public IntegerEntry(DataInputStream stream) throws IOException { - this(stream.readInt()); - } - - public int hashCode() { return value; } - public boolean equals(Object o) { - return o instanceof IntegerEntry && ((IntegerEntry)o).value == value; - } - - public int getTag() { return CONSTANT_Integer; } - public int getValue() { return value; } - - public int getSize() { return 1; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeInt(value); - } - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer("int\t"); - buf.append(getValue()); - buf.append(";"); - return buf.toString(); - } - public String toComment(String ownerClassname) { - return "//int "+getValue(); - } - } - - public class FloatEntry extends ChildlessEntry implements Entry { - private final float value; - public FloatEntry(float value) { this.value = value; } - public FloatEntry(DataInputStream stream) throws IOException { - this(stream.readFloat()); - } - - public int hashCode() { return (int)value; } - public boolean equals(Object o) { - return o instanceof FloatEntry && ((FloatEntry)o).value == value; - } - - public int getTag() { return CONSTANT_Float; } - public float getValue() { return value; } - - public int getSize() { return 1; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeFloat(value); - } - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer("float\t"); - buf.append(getValue()); - buf.append("f"); - return buf.toString(); - } - public String toComment(String ownerClassname) { - return "//float "+getValue()+"f"; - } - } - - public class LongEntry extends ChildlessEntry implements Entry { - private final long value; - public LongEntry(long value) { this.value = value; } - public LongEntry(DataInputStream stream) throws IOException { - this(stream.readLong()); - } - - public int hashCode() { return (int)value; } - public boolean equals(Object o) { - return o instanceof LongEntry && ((LongEntry)o).value == value; - } - - public int getTag() { return CONSTANT_Long; } - public long getValue() { return value; } - - public int getSize() { return 2; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeLong(value); - } - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer("long\t"); - buf.append(getValue()); - buf.append("l;"); - return buf.toString(); - } - public String toComment(String ownerClassname) { - return "//long "+getValue()+"l"; - } - } - - public class DoubleEntry extends ChildlessEntry implements Entry { - private final double value; - public DoubleEntry(double value) { this.value = value; } - public DoubleEntry(DataInputStream stream) throws IOException { - this(stream.readDouble()); - } - - public int hashCode() { return (int)value; } - public boolean equals(Object o) { - return o instanceof DoubleEntry && ((DoubleEntry)o).value == value; - } - - public int getTag() { return CONSTANT_Double; } - public double getValue() { return value; } - - public int getSize() { return 2; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeDouble(value); - } - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer("double\t"); - buf.append(getValue()); - return buf.toString(); - } - public String toComment(String ownerClassname) { - return "//double "+getValue(); - } - } - - public class Utf8Entry extends ChildlessEntry implements Entry { - private final String value; - private final byte[] bytes; - public Utf8Entry(String value) { - this.value = value.intern(); - this.bytes = null; - } - public Utf8Entry(DataInputStream stream) throws IOException { - this(stream.readUTF()); - } - public Utf8Entry(byte[] bytes) { - this.bytes = bytes; - this.value = null; - } - - public int hashCode() { - if (bytes != null) return bytes.hashCode(); - return value.hashCode(); - } - public boolean equals(Object o) { - boolean isEqual = o instanceof Utf8Entry; - if (bytes != null) { - isEqual = isEqual && ((Utf8Entry)o).bytes == bytes; - } - else { - isEqual = isEqual && ((Utf8Entry)o).value == value; - } - return isEqual; - } - - public int getTag() { return CONSTANT_Utf8; } - public String getValue() { return value; } - public byte[] getBytes() { return bytes; } - - public int getSize() { return 1; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - if (bytes != null) { - if (bytes.length > 65535) { - throw new IOException("String literal of length " + bytes.length + " does not fit in Classfile"); - } - stream.writeShort(bytes.length); - stream.write(bytes); - } - else - stream.writeUTF(value); - } - // Follows javap output format for Utf8 pool entries. - public String toString() { return "Asciz\t"+escaped(getValue())+";"; } - public String toComment(String ownerClassname) { - return "//Asciz "+escaped(getValue()); - } - private String escaped(String s) { - return s.replace("\n", "\\n"); - } - } - - abstract public class StringEntry implements Entry { - protected String value; - protected int valueIndex; - - public int hashCode() { - assert value != null; - return value.hashCode(); - } - public boolean equals(Object o) { - return o instanceof StringEntry && ((StringEntry)o).value == value; - } - - public int getTag() { return CONSTANT_String; } - public String getValue() { return value; } - - public int getSize() { return 1; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(valueIndex); - } - // Follows javap output format for String pool entries. - public String toString() { - return "String\t#"+valueIndex+";\t// "+escaped(getValue()); - } - public String toComment(String ownerClassname) { - return "//String "+escaped(getValue()); - } - private String escaped(String s) { - return s.replace("\n", "\\n"); - } - } - - public class StringEntryValue extends StringEntry implements EntryValue { - public StringEntryValue(String value) { - this.value = value.intern(); - } - public void addChildren() { - valueIndex = addUtf8(value); - } - } - - public class StringEntryIndex extends StringEntry implements EntryIndex { - public StringEntryIndex(int valueIndex) { - this.valueIndex = valueIndex; - } - public StringEntryIndex(DataInputStream stream) throws IOException { - this(stream.readShort()); - } - public String getValue() { - if (value == null) fetchChildren(); - return super.getValue(); - } - public void fetchChildren() { - value = lookupUtf8(valueIndex); - } - } - - abstract public class DescriptorEntry implements Entry { - protected String name; - protected int nameIndex; - - public int hashCode() { - assert name != null; - return name.hashCode(); - } - public boolean equals(Object o) { - return o instanceof DescriptorEntry && ((DescriptorEntry)o).name == name; - } - - public int getTag() { return CONSTANT_Class; } - public String getValue() { return name; } - - public int getSize() { return 1; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(nameIndex); - } - // Follows javap output format for class pool entries. - public String toString() { - StringBuffer buf = new StringBuffer("class\t#"); - buf.append(nameIndex); - buf.append(";\t// "); - buf.append(getClassName()); - return buf.toString(); - } - public String toComment(String ownerClassname) { - return "//class "+getClassName(); - } - private String getClassName() { - StringBuffer buf = new StringBuffer(); - String value = getValue(); - if (value.startsWith("[")) buf.append("\""); - buf.append(value); - if (value.startsWith("[")) buf.append("\""); - return buf.toString(); - } - } - - protected class DescriptorEntryValue - extends DescriptorEntry - implements EntryValue { - public DescriptorEntryValue(String name) { this.name = name.intern(); } - public void addChildren() { - nameIndex = addUtf8(name); - } - } - - protected class DescriptorEntryIndex - extends DescriptorEntry - implements EntryIndex { - public DescriptorEntryIndex(int nameIndex) { this.nameIndex = nameIndex; } - public DescriptorEntryIndex(DataInputStream stream) throws IOException { - this(stream.readShort()); - } - public String getValue() { - if (name == null) fetchChildren(); - return super.getValue(); - } - public void fetchChildren() { - name = lookupUtf8(nameIndex); - } - } - - abstract public class FieldOrMethodRefEntry implements Entry { - private final int tag; - protected String className, thingName, signature; - protected int classIndex, nameAndTypeIndex; - - public FieldOrMethodRefEntry(int tag) { - assert tag == CONSTANT_Fieldref - || tag == CONSTANT_Methodref - || tag == CONSTANT_InterfaceMethodref; - - this.tag = tag; - } - - public int hashCode() { - return tag - + className.hashCode() - + thingName.hashCode() - + signature.hashCode(); - } - public boolean equals(Object o) { - return o instanceof FieldOrMethodRefEntry - && ((FieldOrMethodRefEntry)o).tag == tag - && ((FieldOrMethodRefEntry)o).className == className - && ((FieldOrMethodRefEntry)o).thingName == thingName - && ((FieldOrMethodRefEntry)o).signature == signature; - } - - public int getTag() { return tag; } - public String getClassName() { return className; } - public String getFieldOrMethodName() { return thingName; } - public String getSignature() { return signature; } - - public int getSize() { return 1; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(classIndex); - stream.writeShort(nameAndTypeIndex); - } - // Follows javap output format for field/method pool entries. - public String toString() { - return getEntryType(tag)+"\t#"+classIndex+".#"+nameAndTypeIndex+ - ";\t// "+getName("")+":"+signature; - } - public String toComment(String ownerClassName) { - return "//"+getEntryType(tag)+" "+getName(ownerClassName)+":"+signature; - } - private String getName(String ownerClassName) { - String name = getFieldOrMethodName(); - if (JMethod.INSTANCE_CONSTRUCTOR_NAME.equals(name)) - name = "\""+name+"\""; - if (!getClassName().equals(ownerClassName)) - name = getClassName()+"."+name; - return name; - } - } - - protected class FieldOrMethodRefEntryValue - extends FieldOrMethodRefEntry - implements EntryValue { - public FieldOrMethodRefEntryValue(int tag, - String className, - String thingName, - String signature) { - super(tag); - this.className = className.intern(); - this.thingName = thingName.intern(); - this.signature = signature.intern(); - } - - public void addChildren() { - classIndex = addClass(className); - nameAndTypeIndex = addNameAndType(thingName, signature); - } - } - - protected class FieldOrMethodRefEntryIndex - extends FieldOrMethodRefEntry - implements EntryIndex { - public FieldOrMethodRefEntryIndex(int tag, - int classIndex, - int nameAndTypeIndex) { - super(tag); - this.classIndex = classIndex; - this.nameAndTypeIndex = nameAndTypeIndex; - } - public FieldOrMethodRefEntryIndex(int tag, DataInputStream stream) - throws IOException { - this(tag, stream.readShort(), stream.readShort()); - } - public String getClassName() { - if (className == null) fetchChildren(); - return super.getClassName(); - } - public String getFieldOrMethodName() { - if (thingName == null) fetchChildren(); - return super.getFieldOrMethodName(); - } - public String getSignature() { - if (signature == null) fetchChildren(); - return super.getSignature(); - } - public void fetchChildren() { - className = lookupClass(classIndex); - NameAndTypeEntry nat = (NameAndTypeEntry)lookupEntry(nameAndTypeIndex); - thingName = nat.getName(); - signature = nat.getDescriptor(); - } - } - - abstract public class NameAndTypeEntry implements Entry { - protected String name, descriptor; - protected int nameIndex, descriptorIndex; - - public int hashCode() { return name.hashCode() + descriptor.hashCode(); } - public boolean equals(Object o) { - return o instanceof NameAndTypeEntry - && ((NameAndTypeEntry)o).name == name - && ((NameAndTypeEntry)o).descriptor == descriptor; - } - - public int getTag() { return CONSTANT_NameAndType; } - public String getName() { return name; } - public String getDescriptor() { return descriptor; } - - public int getSize() { return 1; } - public void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(nameIndex); - stream.writeShort(descriptorIndex); - } - // Follows javap output format for name/type pool entries. - public String toString() { - String natName = getName(); - if (JMethod.INSTANCE_CONSTRUCTOR_NAME.equals(natName)) - natName = "\""+natName+"\""; - return "NameAndType\t#"+nameIndex+":#"+descriptorIndex+ - ";// "+natName+":"+getDescriptor(); - } - public String toComment(String ownerClassname) { return ""; } - } - - protected class NameAndTypeEntryValue - extends NameAndTypeEntry - implements EntryValue { - public NameAndTypeEntryValue(String name, String descriptor) { - this.name = name.intern(); - this.descriptor = descriptor.intern(); - } - public void addChildren() { - nameIndex = addUtf8(name); - descriptorIndex = addUtf8(descriptor); - } - } - - protected class NameAndTypeEntryIndex - extends NameAndTypeEntry - implements EntryIndex { - public NameAndTypeEntryIndex(int nameIndex, int descriptorIndex) { - this.nameIndex = nameIndex; - this.descriptorIndex = descriptorIndex; - } - public NameAndTypeEntryIndex(DataInputStream stream) throws IOException { - this(stream.readShort(), stream.readShort()); - } - public String getName() { - if (name == null) fetchChildren(); - return super.getName(); - } - public String getDescriptor() { - if (descriptor == null) fetchChildren(); - return super.getDescriptor(); - } - public void fetchChildren() { - name = lookupUtf8(nameIndex); - descriptor = lookupUtf8(descriptorIndex); - } - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JConstantValueAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JConstantValueAttribute.java deleted file mode 100644 index 6ee05e43c7..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JConstantValueAttribute.java +++ /dev/null @@ -1,69 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * ConstantValue attribute representing the value of a constant field. - * - * There can be no more than one ConstantValue attribute in the attributes - * table of a given field_info structure.. See section 4.8.2 of the JVM - * specification. - * - * @author Stephane Micheloud - * @version 1.0 - */ - -public class JConstantValueAttribute extends JAttribute { - /** Constant pool of the current classfile. */ - private JConstantPool pool; - - protected int constantValueIndex; - - public JConstantValueAttribute(FJBGContext context, - JClass clazz, - JField field) { - super(context, clazz); - this.pool = clazz.pool; - - assert field.getOwner() == clazz; - } - - public JConstantValueAttribute(FJBGContext context, - JClass clazz, - Object owner, // JField - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.pool = clazz.pool; - - this.constantValueIndex = stream.readShort(); - - assert name.equals(getName()); - } - - public String getName() { return "ConstantValue"; } - - // Follows javap output format for ConstantValue attribute. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" Constant value: "); - buf.append(pool.lookupEntry(constantValueIndex)); - return buf.toString(); - } - - protected int getSize() { - return 2; // Short.SIZE - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(constantValueIndex); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JEnclosingMethodAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JEnclosingMethodAttribute.java deleted file mode 100644 index f663f00ae1..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JEnclosingMethodAttribute.java +++ /dev/null @@ -1,83 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * EclosingMethod attribute - - * A class must have an EnclosingMethod attribute if and only if it is a - * local class or an anonymous class. A class may have no more than one - * EnclosingMethod attribute. See section 4.8.6 of the JVM specification. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JEnclosingMethodAttribute extends JAttribute { - /** Constant pool of the current classfile. */ - private JConstantPool pool; - - protected final int classIdx; - protected final int nameAndTypeIdx; - - public JEnclosingMethodAttribute(FJBGContext context, - JClass clazz, - String className, - String methodName, - JType methodType) { - super(context, clazz); - this.pool = clazz.pool; - - this.classIdx = pool.addClass(className); - this.nameAndTypeIdx = pool.addNameAndType(methodName, methodType.getSignature()); - } - - public JEnclosingMethodAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.pool = clazz.pool; - - this.classIdx = stream.readShort(); - this.nameAndTypeIdx = stream.readShort(); - - assert name.equals(getName()); - } - - public String getName() { return "EnclosingMethod"; } - - // Follows javap output format for EnclosingMethod attribute. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" EnclosingMethod:"); - buf.append("\n #"); - buf.append(classIdx); - if (nameAndTypeIdx != 0) { - buf.append(" of #"); - buf.append(nameAndTypeIdx); - } - buf.append(";\t// "); - buf.append(pool.lookupEntry(classIdx)); - buf.append("\n"); - return buf.toString(); - } - - protected int getSize() { - return 4; // 2 * Short.SIZE - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(classIdx); - stream.writeShort(nameAndTypeIdx); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JExceptionsAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JExceptionsAttribute.java deleted file mode 100644 index b91d0f2e93..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JExceptionsAttribute.java +++ /dev/null @@ -1,90 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * Exceptions attribute - - * This table is used by compilers to indicate which Exceptions a method - * is declared to throw. See section 2.6.4 of the JVM specification. - * - * @author Stephane Micheloud - * @version 1.0 - */ - -public class JExceptionsAttribute extends JAttribute { - /** Constant pool of the current classfile. */ - private JConstantPool pool; - - protected int[] indexTable; - protected int count; - - public JExceptionsAttribute(FJBGContext context, - JClass clazz, - JMethod owner) { - super(context, clazz); - this.pool = clazz.pool; - - this.count = 0; - this.indexTable = new int[8]; // some size > count - - assert clazz == owner.getOwner(); - } - - public JExceptionsAttribute(FJBGContext context, - JClass clazz, - Object owner, //JMethod - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.pool = clazz.pool; - - this.count = stream.readShort(); - this.indexTable = new int[count]; - for (int i = 0; i < count; ++i) - indexTable[i] = stream.readShort(); - - assert name.equals(getName()); - } - - public void addEntry(int classIndex) { - if (count >= indexTable.length) { - int[] newIT = new int[indexTable.length * 2]; - System.arraycopy(indexTable, 0, newIT, 0, indexTable.length); - indexTable = newIT; - } - indexTable[count++] = classIndex; - } - - public String getName() { return "Exceptions"; } - - // Follows javap output format for Exceptions attribute. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" Exceptions: "); - for (int i = 0; i < indexTable.length; ++i) { - buf.append("\n throws "); - buf.append(JClass.toExternalName(pool.lookupClass(indexTable[i]))); - } - buf.append("\n"); - return buf.toString(); - } - - protected int getSize() { - return 2 + indexTable.length * 2; - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(count); - for (int i = 0; i < count; ++i) - stream.writeShort(indexTable[i]); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java b/src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java deleted file mode 100644 index d82db8289f..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java +++ /dev/null @@ -1,667 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Extended list of instructions, providing pseudo-instructions which - * are easier to use than the standard ones. - * - * @author Michel Schinz, Thomas Friedli - * @version 1.0 - */ - -public class JExtendedCode extends JCode { - public final static int COND_EQ = 0; - public final static int COND_NE = 1; - public final static int COND_LT = 2; - public final static int COND_GE = 3; - public final static int COND_GT = 4; - public final static int COND_LE = 5; - - private final JOpcode[] forbidden = new JOpcode[0]; - private final JOpcode[] nothingToDo = new JOpcode[0]; - - private final JOpcode[][][] typeConversions = { - { - /* T_BOOLEAN -> T_BOOLEAN */ nothingToDo, - /* T_BOOLEAN -> T_CHAR */ forbidden, - /* T_BOOLEAN -> T_FLOAT */ forbidden, - /* T_BOOLEAN -> T_DOUBLE */ forbidden, - /* T_BOOLEAN -> T_BYTE */ forbidden, - /* T_BOOLEAN -> T_SHORT */ forbidden, - /* T_BOOLEAN -> T_INT */ forbidden, - /* T_BOOLEAN -> T_LONG */ forbidden - }, - { - /* T_CHAR -> T_BOOLEAN */ forbidden, - /* T_CHAR -> T_CHAR */ nothingToDo, - /* T_CHAR -> T_FLOAT */ {JOpcode.I2F}, - /* T_CHAR -> T_DOUBLE */ {JOpcode.I2D}, - /* T_CHAR -> T_BYTE */ {JOpcode.I2B}, - /* T_CHAR -> T_SHORT */ {JOpcode.I2S}, - /* T_CHAR -> T_INT */ nothingToDo, - /* T_CHAR -> T_LONG */ {JOpcode.I2L} - }, - { - /* T_FLOAT -> T_BOOLEAN */ forbidden, - /* T_FLOAT -> T_CHAR */ {JOpcode.F2I, JOpcode.I2C}, - /* T_FLOAT -> T_FLOAT */ nothingToDo, - /* T_FLOAT -> T_DOUBLE */ {JOpcode.F2D}, - /* T_FLOAT -> T_BYTE */ {JOpcode.F2I, JOpcode.I2B}, - /* T_FLOAT -> T_SHORT */ {JOpcode.F2I, JOpcode.I2S}, - /* T_FLOAT -> T_INT */ {JOpcode.F2I}, - /* T_FLOAT -> T_LONG */ {JOpcode.F2L} - }, - { - /* T_DOUBLE -> T_BOOLEAN */ forbidden, - /* T_DOUBLE -> T_CHAR */ {JOpcode.D2I, JOpcode.I2C}, - /* T_DOUBLE -> T_FLOAT */ {JOpcode.D2F}, - /* T_DOUBLE -> T_DOUBLE */ nothingToDo, - /* T_DOUBLE -> T_BYTE */ {JOpcode.D2I, JOpcode.I2B}, - /* T_DOUBLE -> T_SHORT */ {JOpcode.D2I, JOpcode.I2S}, - /* T_DOUBLE -> T_INT */ {JOpcode.D2I}, - /* T_DOUBLE -> T_LONG */ {JOpcode.D2L} - }, - { - /* T_BYTE -> T_BOOLEAN */ forbidden, - /* T_BYTE -> T_CHAR */ {JOpcode.I2C}, - /* T_BYTE -> T_FLOAT */ {JOpcode.I2F}, - /* T_BYTE -> T_DOUBLE */ {JOpcode.I2D}, - /* T_BYTE -> T_BYTE */ nothingToDo, - /* T_BYTE -> T_SHORT */ nothingToDo, - /* T_BYTE -> T_INT */ nothingToDo, - /* T_BYTE -> T_LONG */ {JOpcode.I2L} - }, - { - /* T_SHORT -> T_BOOLEAN */ forbidden, - /* T_SHORT -> T_CHAR */ {JOpcode.I2C}, - /* T_SHORT -> T_FLOAT */ {JOpcode.I2F}, - /* T_SHORT -> T_DOUBLE */ {JOpcode.I2D}, - /* T_SHORT -> T_BYTE */ {JOpcode.I2B}, - /* T_SHORT -> T_SHORT */ nothingToDo, - /* T_SHORT -> T_INT */ nothingToDo, - /* T_SHORT -> T_LONG */ {JOpcode.I2L} - }, - { - /* T_INT -> T_BOOLEAN */ forbidden, - /* T_INT -> T_CHAR */ {JOpcode.I2C}, - /* T_INT -> T_FLOAT */ {JOpcode.I2F}, - /* T_INT -> T_DOUBLE */ {JOpcode.I2D}, - /* T_INT -> T_BYTE */ {JOpcode.I2B}, - /* T_INT -> T_SHORT */ {JOpcode.I2S}, - /* T_INT -> T_INT */ nothingToDo, - /* T_INT -> T_LONG */ {JOpcode.I2L} - }, - { - /* T_LONG -> T_BOOLEAN */ forbidden, - /* T_LONG -> T_CHAR */ {JOpcode.L2I, JOpcode.I2C}, - /* T_LONG -> T_FLOAT */ {JOpcode.L2F}, - /* T_LONG -> T_DOUBLE */ {JOpcode.L2D}, - /* T_LONG -> T_BYTE */ {JOpcode.L2I, JOpcode.I2B}, - /* T_LONG -> T_SHORT */ {JOpcode.L2I, JOpcode.I2S}, - /* T_LONG -> T_INT */ {JOpcode.L2I}, - /* T_LONG -> T_LONG */ nothingToDo - } - }; - - public JExtendedCode(FJBGContext context, - JClass clazz, - JMethod owner) { - super(context, clazz, owner); - } - - public void emitPUSH(boolean value) { emitPUSH(value ? 1 : 0); } - public void emitPUSH(Boolean value) { emitPUSH(value.booleanValue()); } - - public void emitPUSH(byte value) { - switch (value) { - case -1: emitICONST_M1(); break; - case 0: emitICONST_0(); break; - case 1: emitICONST_1(); break; - case 2: emitICONST_2(); break; - case 3: emitICONST_3(); break; - case 4: emitICONST_4(); break; - case 5: emitICONST_5(); break; - default: - emitBIPUSH(value); - } - } - public void emitPUSH(Byte value) { emitPUSH(value.byteValue()); } - - public void emitPUSH(short value) { - switch (value) { - case -1: emitICONST_M1(); break; - case 0: emitICONST_0(); break; - case 1: emitICONST_1(); break; - case 2: emitICONST_2(); break; - case 3: emitICONST_3(); break; - case 4: emitICONST_4(); break; - case 5: emitICONST_5(); break; - default: - if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE) - emitBIPUSH((byte)value); - else - emitSIPUSH(value); - } - } - public void emitPUSH(Short value) { emitPUSH(value.shortValue()); } - - // TODO check that we do the right thing here - public void emitPUSH(char value) { emitPUSH((int)value); } - public void emitPUSH(Character value) { emitPUSH(value.charValue()); } - - public void emitPUSH(int value) { - switch (value) { - case -1: emitICONST_M1(); break; - case 0: emitICONST_0(); break; - case 1: emitICONST_1(); break; - case 2: emitICONST_2(); break; - case 3: emitICONST_3(); break; - case 4: emitICONST_4(); break; - case 5: emitICONST_5(); break; - default: - if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE) - emitBIPUSH((byte)value); - else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) - emitSIPUSH((short)value); - else - emitPUSH_index(pool.addInteger(value)); - break; - } - } - public void emitPUSH(Integer value) { emitPUSH(value.intValue()); } - - public void emitPUSH(long value) { - if (value == 0L) - emitLCONST_0(); - else if (value == 1L) - emitLCONST_1(); - else - emitLDC2_W(value); - } - public void emitPUSH(Long value) { emitPUSH(value.longValue()); } - - private static final Float ZEROF = Float.valueOf(0f); - private static final Float ONEF = Float.valueOf(1f); - private static final Float TWOF = Float.valueOf(2f); - public void emitPUSH(Float value) { - if (ZEROF.equals(value)) - emitFCONST_0(); - else if (ONEF.equals(value)) - emitFCONST_1(); - else if (TWOF.equals(value)) - emitFCONST_2(); - else - emitPUSH_index(pool.addFloat(value.floatValue())); - } - public void emitPUSH(float value) { emitPUSH(Float.valueOf(value)); } - - private static final Double ZEROD = Double.valueOf(0d); - private static final Double ONED = Double.valueOf(1d); - public void emitPUSH(Double value) { - if (ZEROD.equals(value)) - emitDCONST_0(); - else if (ONED.equals(value)) - emitDCONST_1(); - else - emitLDC2_W(value.doubleValue()); - } - public void emitPUSH(double value) { emitPUSH(Double.valueOf(value)); } - - public void emitPUSH(String s) { - emitPUSH_index(pool.addString(s)); - } - - /** Pushes a class literal on the stack */ - public void emitPUSH(JReferenceType type) { - assert owner.owner.major >= 49; - emitPUSH_index(pool.addClass(type.getDescriptor())); - } - - protected void emitPUSH_index(int index) { - if (index <= 0xFF) - emitU1(JOpcode.LDC, index); - else - emitU2(JOpcode.LDC_W, index); - } - - public void emitLOAD(int index, JType type) { - JOpcode opcode; - - switch (type.getTag()) { - case JType.T_BOOLEAN: case JType.T_BYTE: case JType.T_CHAR: - case JType.T_SHORT: case JType.T_INT: - switch (index) { - case 0: emitILOAD_0(); return; - case 1: emitILOAD_1(); return; - case 2: emitILOAD_2(); return; - case 3: emitILOAD_3(); return; - default: opcode = JOpcode.ILOAD; - } break; - case JType.T_FLOAT: - switch (index) { - case 0: emitFLOAD_0(); return; - case 1: emitFLOAD_1(); return; - case 2: emitFLOAD_2(); return; - case 3: emitFLOAD_3(); return; - default: opcode = JOpcode.FLOAD; - } break; - case JType.T_LONG: - switch (index) { - case 0: emitLLOAD_0(); return; - case 1: emitLLOAD_1(); return; - case 2: emitLLOAD_2(); return; - case 3: emitLLOAD_3(); return; - default: opcode = JOpcode.LLOAD; - } break; - case JType.T_DOUBLE: - switch (index) { - case 0: emitDLOAD_0(); return; - case 1: emitDLOAD_1(); return; - case 2: emitDLOAD_2(); return; - case 3: emitDLOAD_3(); return; - default: opcode = JOpcode.DLOAD; - } break; - case JType.T_ARRAY: case JType.T_OBJECT: - switch (index) { - case 0: emitALOAD_0(); return; - case 1: emitALOAD_1(); return; - case 2: emitALOAD_2(); return; - case 3: emitALOAD_3(); return; - default: opcode = JOpcode.ALOAD; - } break; - default: - throw new IllegalArgumentException("invalid type for load "+type); - } - - if (index > 0xFF) - emitWIDE(opcode, index); - else - emitU1(opcode, index); - } - public void emitLOAD(JLocalVariable var) { - emitLOAD(var.index, var.type); - } - - public void emitSTORE(int index, JType type) { - JOpcode opcode; - - switch (type.getTag()) { - case JType.T_BOOLEAN: case JType.T_BYTE: case JType.T_CHAR: - case JType.T_SHORT: case JType.T_INT: - switch (index) { - case 0: emitISTORE_0(); return; - case 1: emitISTORE_1(); return; - case 2: emitISTORE_2(); return; - case 3: emitISTORE_3(); return; - default: opcode = JOpcode.ISTORE; - } break; - case JType.T_FLOAT: - switch (index) { - case 0: emitFSTORE_0(); return; - case 1: emitFSTORE_1(); return; - case 2: emitFSTORE_2(); return; - case 3: emitFSTORE_3(); return; - default: opcode = JOpcode.FSTORE; - } break; - case JType.T_LONG: - switch (index) { - case 0: emitLSTORE_0(); return; - case 1: emitLSTORE_1(); return; - case 2: emitLSTORE_2(); return; - case 3: emitLSTORE_3(); return; - default: opcode = JOpcode.LSTORE; - } break; - case JType.T_DOUBLE: - switch (index) { - case 0: emitDSTORE_0(); return; - case 1: emitDSTORE_1(); return; - case 2: emitDSTORE_2(); return; - case 3: emitDSTORE_3(); return; - default: opcode = JOpcode.DSTORE; - } break; - case JType.T_ARRAY: case JType.T_OBJECT: case JType.T_ADDRESS: - switch (index) { - case 0: emitASTORE_0(); return; - case 1: emitASTORE_1(); return; - case 2: emitASTORE_2(); return; - case 3: emitASTORE_3(); return; - default: opcode = JOpcode.ASTORE; - } break; - default: - throw new IllegalArgumentException("invalid type for store "+type); - } - - if (index > 0xFF) - emitWIDE(opcode, index); - else - emitU1(opcode, index); - } - public void emitSTORE(JLocalVariable var) { - emitSTORE(var.index, var.type); - } - - public void emitALOAD(JType type) { - switch (type.getTag()) { - case JType.T_BOOLEAN: - case JType.T_BYTE: - emitBALOAD(); - break; - case JType.T_CHAR: - emitCALOAD(); - break; - case JType.T_SHORT: - emitSALOAD(); - break; - case JType.T_INT: - emitIALOAD(); - break; - case JType.T_FLOAT: - emitFALOAD(); - break; - case JType.T_LONG: - emitLALOAD(); - break; - case JType.T_DOUBLE: - emitDALOAD(); - break; - case JType.T_ARRAY: - case JType.T_OBJECT: - emitAALOAD(); - break; - default: - throw new IllegalArgumentException("invalid type for aload " + type); - } - } - - public void emitASTORE(JType type) { - switch (type.getTag()) { - case JType.T_BOOLEAN: - case JType.T_BYTE: - emitBASTORE(); - break; - case JType.T_CHAR: - emitCASTORE(); - break; - case JType.T_SHORT: - emitSASTORE(); - break; - case JType.T_INT: - emitIASTORE(); - break; - case JType.T_FLOAT: - emitFASTORE(); - break; - case JType.T_LONG: - emitLASTORE(); - break; - case JType.T_DOUBLE: - emitDASTORE(); - break; - case JType.T_ARRAY: - case JType.T_OBJECT: - emitAASTORE(); - break; - default: - throw new IllegalArgumentException("invalid type for astore " + type); - } - } - - public void emitRETURN(JType type) { - if (type.isValueType()) { - switch (type.getTag()) { - case JType.T_BOOLEAN: - case JType.T_BYTE: - case JType.T_CHAR: - case JType.T_SHORT: - case JType.T_INT: - emitIRETURN(); - break; - case JType.T_FLOAT: - emitFRETURN(); - break; - case JType.T_LONG: - emitLRETURN(); - break; - case JType.T_DOUBLE: - emitDRETURN(); - break; - } - } else if (type.isArrayType() || type.isObjectType()) - emitARETURN(); - else if (type == JType.VOID) - emitRETURN(); - else - throw new IllegalArgumentException("invalid type for RETURN " + type); - } - - public void emitADD(JType type) { - switch (type.getTag()) { - case JType.T_BOOLEAN: case JType.T_BYTE: case JType.T_CHAR: - case JType.T_SHORT: case JType.T_INT: - emitIADD(); break; - case JType.T_FLOAT: - emitFADD(); break; - case JType.T_LONG: - emitLADD(); break; - case JType.T_DOUBLE: - emitDADD(); break; - } - } - - /** - * Emits a basic type conversion instruction choosen according to the - * types given in parameter. - * - * @param fromType The type of the value to be cast into another type. - * @param toType The type the value will be cast into. - */ - public void emitT2T(JType fromType, JType toType) { - assert fromType.getTag() >= JType.T_BOOLEAN - && fromType.getTag() <= JType.T_LONG - && toType.getTag() >= JType.T_BOOLEAN - && toType.getTag() <= JType.T_LONG; - - JOpcode[] conv = typeConversions[fromType.getTag() - 4][toType.getTag() - 4]; - if (conv == forbidden) { - throw new Error("inconvertible types : " + fromType.toString() - + " -> " + toType.toString()); - } else if (conv != nothingToDo) { - for (int i = 0; i < conv.length; i++) { - emit(conv[i]); - } - } - } - - public void emitIF(int cond, Label label) throws OffsetTooBigException { - assert cond >= COND_EQ && cond <= COND_LE; - emitU2(JOpcode.OPCODES[153 + cond], label.getOffset16(getPC() + 1, getPC())); - } - public void emitIF(int cond, int targetPC) throws OffsetTooBigException { - int offset = targetPC - getPC(); - emitU2(JOpcode.OPCODES[153 + cond], offset); - } - public void emitIF(int cond) throws OffsetTooBigException { - emitIF(cond, 0); - } - - public void emitIF_ICMP(int cond, Label label) throws OffsetTooBigException { - assert cond >= COND_EQ && cond <= COND_LE; - emitU2(JOpcode.OPCODES[159 + cond], label.getOffset16(getPC() + 1, getPC())); - } - public void emitIF_ICMP(int cond, int targetPC) throws OffsetTooBigException { - int offset = targetPC - getPC(); - emitU2(JOpcode.OPCODES[159 + cond], offset); - } - public void emitIF_ICMP(int cond) throws OffsetTooBigException { - emitIF_ICMP(cond, 0); - } - - public void emitIF_ACMP(int cond, Label label) throws OffsetTooBigException { - assert cond == COND_EQ || cond == COND_NE; - emitU2(JOpcode.OPCODES[165 + cond], label.getOffset16(getPC() + 1, getPC())); - } - public void emitIF_ACMP(int cond, int targetPC) throws OffsetTooBigException { - int offset = targetPC - getPC(); - emitU2(JOpcode.OPCODES[165 + cond], offset); - } - public void emitIF_ACMP(int cond) throws OffsetTooBigException { - emitIF_ACMP(cond, 0); - } - - public void emitGOTO_maybe_W(Label label, boolean defaultToWide) { - if (label.anchored) - emitGOTO_maybe_W(label.targetPC); - else { - if (defaultToWide) - emitGOTO_W(label); - else { - try { - emitGOTO(label); - } catch (OffsetTooBigException e) { - throw new Error(e); - } - } - } - } - - public void emitGOTO_maybe_W(int targetPC) { - int offset = targetPC - (getPC() + 1); - if (offset < Short.MIN_VALUE || offset > Short.MAX_VALUE) - emitGOTO_W(targetPC); - else { - try { - emitGOTO(targetPC); - } catch (OffsetTooBigException e) { - throw new Error(e); - } - } - } - - /** - * Emits a switch instruction choosen according to the caracteristics - * of the given list of keys and a default maxRate. - * - * @param keySets The array of all keys that must be compared to the - * value on stack. - * @param branches The labels representing the jump addresses linked - * with the corresponding keys. - * @param defaultBranch The label representing the default branch - * address. - */ - public void emitSWITCH(int[][] keySets, - Label[] branches, - Label defaultBranch, - double minDensity) { - assert keySets.length == branches.length; - - int flatSize = 0; - for (int i = 0; i < keySets.length; ++i) - flatSize += keySets[i].length; - - int[] flatKeys = new int[flatSize]; - Label[] flatBranches = new Label[flatSize]; - int flatI = 0; - for (int i = 0; i < keySets.length; ++i) { - Label branch = branches[i]; - int[] keys = keySets[i]; - for (int j = 0; j < keys.length; ++j) { - flatKeys[flatI] = keys[j]; - flatBranches[flatI] = branch; - } - ++flatI; - } - assert flatI == flatSize; - emitSWITCH(flatKeys, flatBranches, defaultBranch, minDensity); - } - - /** - * Emits a switch instruction choosen according to the caracteristics - * of the given list of keys and a given maxRate. - * - * @param keys The array of all keys that must be compared to the - * value on stack. - * @param branches The labels representing the jump addresses linked - * with the corresponding keys. - * @param defaultBranch The label representing the default branch - * address. - * @param minDensity The minimum density to use for TABLESWITCH. - */ - public void emitSWITCH(int[] keys, - Label[] branches, - Label defaultBranch, - double minDensity) { - assert keys.length == branches.length; - - //The special case for empty keys. It makes sense to allow - //empty keys and generate LOOKUPSWITCH with defaultBranch - //only. This is exactly what javac does for switch statement - //that has only a default case. - if (keys.length == 0) { - emitLOOKUPSWITCH(keys, branches, defaultBranch); - return; - } - //the rest of the code assumes that keys.length > 0 - - // sorting the tables - // FIXME use quicksort - for (int i = 1; i < keys.length; i++) { - for (int j = 1; j <= keys.length - i; j++) { - if (keys[j] < keys[j - 1]) { - int tmp = keys[j]; - keys[j] = keys[j - 1]; - keys[j - 1] = tmp; - - Label tmp_l = branches[j]; - branches[j] = branches[j - 1]; - branches[j - 1] = tmp_l; - } - } - } - - int keyMin = keys[0], keyMax = keys[keys.length - 1]; - /** Calculate in long to guard against overflow. */ - long keyRange = (long)keyMax - keyMin + 1; - if ((double)keys.length / (double)keyRange >= minDensity) { - // Keys are dense enough, use a table in which holes are - // filled with defaultBranch. - int[] newKeys = new int[(int)keyRange]; - Label[] newBranches = new Label[(int)keyRange]; - int oldPos = 0; - for (int i = 0; i < keyRange; ++i) { - int key = keyMin + i; - newKeys[i] = key; - if (keys[oldPos] == key) { - newBranches[i] = branches[oldPos]; - ++oldPos; - } else - newBranches[i] = defaultBranch; - } - assert oldPos == keys.length; - emitTABLESWITCH(newKeys, newBranches, defaultBranch); - } else - emitLOOKUPSWITCH(keys, branches, defaultBranch); - } - - /** - * Emits a method invocation instruction choosen according to - * the caracteristics of the given method. - * - * @param method The method to be invoked. - */ - public void emitINVOKE(JMethod method) { - String mName = method.getName(); - String cName = method.getOwner().getName(); - JMethodType mType = (JMethodType)method.getType(); - if (method.isStatic()) - emitINVOKESTATIC(cName, mName, mType); - else if (method.getOwner().isInterface()) - emitINVOKEINTERFACE(cName, mName, mType); - else - emitINVOKEVIRTUAL(cName, mName, mType); - } - -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JField.java b/src/fjbg/ch/epfl/lamp/fjbg/JField.java deleted file mode 100644 index 29d826ba99..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JField.java +++ /dev/null @@ -1,62 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.IOException; - -/** - * Java class field. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JField extends JFieldOrMethod { - - protected JField(FJBGContext context, - JClass owner, - int accessFlags, - String name, - JType type) { - super(context, owner, accessFlags, name, type); - } - - protected JField(FJBGContext context, - JClass owner, - DataInputStream stream) - throws IOException { - super(context, owner, stream); - } - - // Follows javap output format for fields. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(flagsToString()); - buf.append(toExternalName(getType())); - buf.append(" "); - buf.append(getName()); - buf.append(";\n"); - java.util.Iterator attrsIt = attributes.iterator(); - while (attrsIt.hasNext()) { - JAttribute attrs = (JAttribute)attrsIt.next(); - buf.append(attrs); - } - return buf.toString(); - } - - private String flagsToString() { - StringBuffer buf = new StringBuffer(); - if (isPublic()) buf.append("public "); - else if (isProtected()) buf.append("protected "); - else if (isPrivate()) buf.append("private "); - if (isStatic()) buf.append("static "); - else if (isTransient()) buf.append("transient "); - else if (isVolatile()) buf.append("volatile "); - if (isAbstract()) buf.append("abstract "); - else if (isFinal()) buf.append("final "); - return buf.toString(); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JFieldOrMethod.java b/src/fjbg/ch/epfl/lamp/fjbg/JFieldOrMethod.java deleted file mode 100644 index 794c0f13b5..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JFieldOrMethod.java +++ /dev/null @@ -1,138 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * Abstract superclass for a Java field or method. - * - * No two methods of fields in one class file may have the same name and - * descriptor. See sections 4.6 and 4.7 of the JVM specification. - * - * @author Michel Schinz - * @version 1.0 - */ - -abstract public class JFieldOrMethod extends JMember { - - protected final JClass owner; - protected final JType type; - - protected final int nameIndex, signatureIndex; - - protected JFieldOrMethod(FJBGContext context, - JClass owner, - int accessFlags, - String name, - JType type) { - super(context, accessFlags, name); - this.owner = owner; - this.type = type; - - nameIndex = owner.pool.addUtf8(name); - signatureIndex = owner.pool.addUtf8(type.getSignature()); - } - - protected JFieldOrMethod(FJBGContext context, - JClass owner, - DataInputStream stream) - throws IOException { - super(context); - this.owner = owner; - this.accessFlags = stream.readShort(); - this.nameIndex = stream.readShort(); - this.name = owner.pool.lookupUtf8(nameIndex); - this.signatureIndex = stream.readShort(); - this.type = JType.parseSignature(owner.pool.lookupUtf8(signatureIndex)); - this.attributes.addAll(JAttribute.readFrom(context, owner, this, stream)); - } - - public void freeze() throws JCode.OffsetTooBigException { - assert !frozen; - frozen = true; - } - - public JClass getOwner() { return owner; } - - public JType getType() { return type; } - - public JClass getJClass() { return owner; } - - public boolean isPublic() { - return (accessFlags & JAccessFlags.ACC_PUBLIC) != 0; - } - - public boolean isPrivate() { - return (accessFlags & JAccessFlags.ACC_PRIVATE) != 0; - } - - public boolean isProtected() { - return (accessFlags & JAccessFlags.ACC_PROTECTED) != 0; - } - - public boolean isStatic() { - return (accessFlags & JAccessFlags.ACC_STATIC) != 0; - } - - public boolean isFinal() { - return (accessFlags & JAccessFlags.ACC_FINAL) != 0; - } - - public boolean isSuper() { - return (accessFlags & JAccessFlags.ACC_SUPER) != 0; - } - - public boolean isVolatile() { - return (accessFlags & JAccessFlags.ACC_VOLATILE) != 0; - } - - public boolean isTransient() { - return (accessFlags & JAccessFlags.ACC_TRANSIENT) != 0; - } - - public boolean isNative() { - return (accessFlags & JAccessFlags.ACC_NATIVE) != 0; - } - - public boolean isInterface() { - return (accessFlags & JAccessFlags.ACC_INTERFACE) != 0; - } - - public boolean isAbstract() { - return (accessFlags & JAccessFlags.ACC_ABSTRACT) != 0; - } - - public boolean isStrict() { - return (accessFlags & JAccessFlags.ACC_STRICT) != 0; - } - - // 1.5 specifics - public boolean isBridge() { - return (accessFlags & JAccessFlags.ACC_BRIDGE) != 0; - } - - public boolean hasVarargs() { - return (accessFlags & JAccessFlags.ACC_VARARGS) != 0; - } - - public void writeTo(DataOutputStream stream) throws IOException { - if (! frozen) { - try { - freeze(); - } - catch (JCode.OffsetTooBigException e) { - throw new Error(e); - } - } - stream.writeShort(accessFlags); - stream.writeShort(nameIndex); - stream.writeShort(signatureIndex); - JAttribute.writeTo(getAttributes(), stream); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JInnerClassesAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JInnerClassesAttribute.java deleted file mode 100644 index 1c1ced500d..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JInnerClassesAttribute.java +++ /dev/null @@ -1,201 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * InnerClasses attribute. - * - * The ClassFile structure of a class/interface C must have exactly one - * InnerClasses attribute in its attributes table if the constant pool of C - * contains a CONSTANT_Class_info entry which represents a class or interface - * that is not a member of a package. See section 4.8.5 of the JVM Specification. - * - * @author Iulian Dragos, Stephane Micheloud - * @version 1.1 - */ -public class JInnerClassesAttribute extends JAttribute { - /** Constant pool of the current classfile. */ - private JConstantPool pool; - - /** InnerClass entries */ - private Map/*<String, Entry>*/ entries = new LinkedHashMap(); - - public JInnerClassesAttribute(FJBGContext context, JClass clazz) { - super(context, clazz); - this.pool = clazz.pool; - } - - public JInnerClassesAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.pool = clazz.pool; - - String inner = null; - int count = stream.readShort(); - for (int i = 0; i < count; ++i) { - int innerIdx = stream.readShort(); - int outerIdx = stream.readShort(); - int nameIdx = stream.readShort(); - int flags = stream.readShort(); - inner = pool.lookupClass(innerIdx); - entries.put(inner, new Entry(innerIdx, outerIdx, nameIdx, flags)); - } - - assert name.equals(getName()); - } - - public void addEntry(String inner, String outer, String name, int flags) { - int innerIdx = pool.addClass(inner); - int outerIdx = 0; - if (outer != null) outerIdx = pool.addClass(outer); - int nameIdx = 0; - if (name != null) nameIdx = pool.addUtf8(name); - - Entry e = new Entry(innerIdx, outerIdx, nameIdx, flags); - - if (entries.containsKey(inner)) { - Entry other = (Entry) entries.get(inner); - assert other.outerInfo == e.outerInfo && other.originalName == e.originalName && other.innerFlags == e.innerFlags - : inner + " already declared as " + other; - } else - entries.put(inner, e); - } - - public String getName() { return "InnerClasses"; } - - // Follows javap output format for the InnerClass attribute. - /*@Override*/ public String toString() { - // Here we intentionally use "InnerClass" as javap :-( - StringBuffer buf = new StringBuffer(" InnerClass: "); - for (Iterator it = entries.values().iterator(); it.hasNext(); ) { - Entry e = (Entry)it.next(); - buf.append("\n "); - buf.append(e.innerFlagsToString()); - buf.append("#"); - if (e.originalName != 0) { - buf.append(e.originalName); - buf.append("= #"); - } - buf.append(e.innerInfo); - if (e.outerInfo != 0) { - buf.append(" of #"); - buf.append(e.outerInfo); - } - buf.append("; //"); - if (e.originalName != 0) { - buf.append(pool.lookupUtf8(e.originalName)); - buf.append("="); - } - buf.append("class "); - buf.append(pool.lookupClass(e.innerInfo)); - if (e.outerInfo != 0) { - buf.append(" of class "); - buf.append(pool.lookupClass(e.outerInfo)); - } - } - buf.append("\n"); - return buf.toString(); - } - - protected int getSize() { - return 2 + entries.size() * 8; - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(entries.size()); - for (Iterator it = entries.values().iterator(); it.hasNext(); ) { - Entry e = (Entry)it.next(); - stream.writeShort(e.innerInfo); - stream.writeShort(e.outerInfo); - stream.writeShort(e.originalName); - stream.writeShort(e.innerFlags); - } - } - - /** An entry in the InnerClasses attribute, as defined by the JVM Spec. */ - private class Entry { - /** CONSTANT_Class_info index in the pool for the inner class (mangled). */ - int innerInfo; - - /** CONSTANT_Class_info index in the pool for the outer class (mangled). */ - int outerInfo; - - /** CONSTANT_Utf8_info index in the pool for the original name of the inner class. */ - int originalName; - - /** Short int for modifier flags. */ - int innerFlags; - - public Entry(int iI, int oI, int oN, int f) { - this.innerInfo = iI; - this.outerInfo = oI; - this.originalName = oN; - this.innerFlags = f; - } - - public Entry(String innerClass, String outerClass, String name, int flags) { - this(pool.addClass(innerClass), pool.addClass(outerClass), pool.addUtf8(name), flags); - } - - /** Two entries are equal if they refer to the same inner class. - * innerInfo represents a unique name (mangled). - */ - public boolean equals(Object other) { - if (other instanceof Entry) { - Entry otherEntry = (Entry) other; - return otherEntry.innerInfo == this.innerInfo; - } - return false; - } - - public String innerFlagsToString() { - StringBuffer buf = new StringBuffer(); - if (isPublic()) buf.append("public "); - else if (isProtected()) buf.append("protected "); - else if (isPrivate()) buf.append("private "); - //if (isStatic()) buf.append("static "); // as javap - if (isAbstract()) buf.append("abstract "); - else if (isFinal()) buf.append("final "); - return buf.toString(); - } - - private boolean isPublic() { - return (innerFlags & JAccessFlags.ACC_PUBLIC) != 0; - } - - private boolean isPrivate() { - return (innerFlags & JAccessFlags.ACC_PRIVATE) != 0; - } - - private boolean isProtected() { - return (innerFlags & JAccessFlags.ACC_PROTECTED) != 0; - } - - private boolean isStatic() { - return (innerFlags & JAccessFlags.ACC_STATIC) != 0; - } - - private boolean isFinal() { - return (innerFlags & JAccessFlags.ACC_FINAL) != 0; - } - - private boolean isAbstract() { - return (innerFlags & JAccessFlags.ACC_ABSTRACT) != 0; - } - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JLabel.java b/src/fjbg/ch/epfl/lamp/fjbg/JLabel.java deleted file mode 100644 index 96f3b4ebef..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JLabel.java +++ /dev/null @@ -1,30 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Labels which can be attached to instructions. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JLabel { - public final static int UNDEFINED_ANCHOR = -1; - protected int anchor = UNDEFINED_ANCHOR; - - public boolean isAnchored() { return anchor != UNDEFINED_ANCHOR; } - - public int getAnchor() { - assert isAnchored(); - return anchor; - } - - public void setAnchor(int anchor) { - assert !isAnchored(); - this.anchor = anchor; - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JLineNumberTableAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JLineNumberTableAttribute.java deleted file mode 100644 index f8c09b8ef8..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JLineNumberTableAttribute.java +++ /dev/null @@ -1,121 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * Attribute storing correspondance between instructions and source - * line numbers. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JLineNumberTableAttribute extends JAttribute { - protected final JCode code; - - public JLineNumberTableAttribute(FJBGContext context, - JClass clazz, - JCode owner) { - super(context, clazz); - this.code = owner; - - assert owner.getOwner().getOwner() == clazz; - } - - public JLineNumberTableAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.code = (JCode)owner; - - int[] mapping = new int[code.getSize()]; - - int count = stream.readShort(); - for (int i = 0; i < count; ++i) { - int startPC = stream.readShort(); - int lineNum = stream.readShort(); - mapping[startPC] = lineNum; - } - - // Avoids duplication of LineNumberTable attribute - // (see method ensureLineNumberCapacity in class JCode). - assert code.lineNumbers == null; - code.lineNumbers = new int[0]; - - int lineNum = 0; - for (int pc = 0; pc < mapping.length; ++pc) { - if (mapping[pc] != 0) lineNum = mapping[pc]; - if (lineNum != 0) code.setLineNumber(pc, lineNum); - } - - assert name.equals(getName()); - } - - public String getName() { return "LineNumberTable"; } - - // Follows javap output format for LineNumberTable attribute. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" LineNumberTable: "); - int[] encoding = encode(); - for (int i = 0; i < encoding.length/2; ++i) { - buf.append("\n line "); - buf.append(encoding[i * 2 + 1]); - buf.append(": "); - buf.append(encoding[i * 2]); - } - buf.append("\n"); - return buf.toString(); - } - - protected int[] encoding; - protected int[] encode() { - if (encoding == null) { - int[] lineNumbers = code.getLineNumbers(); - int[] preEncoding = new int[lineNumbers.length * 2]; - int prevLineNum = 0; - - int i = 0; - for (int pc = 0; pc < lineNumbers.length; ++pc) { - int lineNum = lineNumbers[pc]; - if (lineNum != 0 & lineNum != prevLineNum) { - preEncoding[i++] = pc; - preEncoding[i++] = lineNum; - prevLineNum = lineNum; - } - } - if (i == preEncoding.length) - encoding = preEncoding; - else { - encoding = new int[i]; - System.arraycopy(preEncoding, 0, encoding, 0, i); - } - } - return encoding; - } - - protected int getSize() { - int[] encoding = encode(); - return 2 + encoding.length * 2; - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - int[] encoding = encode(); - int entries = encoding.length / 2; - stream.writeShort(entries); - for (int i = 0; i < entries; ++i) { - stream.writeShort(encoding[i * 2]); - stream.writeShort(encoding[i * 2 + 1]); - } - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JLocalVariable.java b/src/fjbg/ch/epfl/lamp/fjbg/JLocalVariable.java deleted file mode 100644 index af7980656f..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JLocalVariable.java +++ /dev/null @@ -1,42 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Representation of a local variable or method argument. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JLocalVariable { - protected final JMethod owner; - protected final JType type; - protected final String name; - protected final int index; - - protected JLocalVariable(FJBGContext context, - JMethod owner, - JType type, - String name, - int index) { - this.owner = owner; - this.type = type; - this.name = name; - this.index = index; - - assert index < 0xFFFF : "index too big for local variable: " + index; - } - - public JMethod getOwner() { return owner; } - public int getIndex() { return index; } - public String getName() { return name; } - public JType getType() { return type; } - - /*@Override*/ public String toString() { - return "0\t"+type.getSize()+"\t"+index+"\t"+name+"\t"+type; - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JLocalVariableTableAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JLocalVariableTableAttribute.java deleted file mode 100644 index b277cc71c0..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JLocalVariableTableAttribute.java +++ /dev/null @@ -1,167 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Iterator; -import java.util.LinkedList; - -import ch.epfl.lamp.fjbg.JConstantPool.*; - -/** - * Attribute storing local variables. - * - * @author Stephane Micheloud - * @version 1.0 - */ - -public class JLocalVariableTableAttribute extends JAttribute { - /** Constant pool of the current classfile. */ - private JConstantPool pool; - - protected final LinkedList/*<Entry>*/ entries = new LinkedList(); - protected int localVariableIndex = 0; - - public JLocalVariableTableAttribute(FJBGContext context, - JClass clazz, - JCode code) { - super(context, clazz); - this.pool = clazz.pool; - - assert code.getOwner().getOwner() == clazz; - } - - public JLocalVariableTableAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.pool = clazz.pool; - - int count = stream.readShort(); - for (int i = 0; i < count; ++i) { - int startPc = stream.readShort(); - int length = stream.readShort(); - int nameIndex = stream.readShort(); - int descIndex = stream.readShort(); - int index = stream.readShort(); - addEntry(startPc, length, nameIndex, descIndex, index); - } - - assert name.equals(getName()); - } - - public void addEntry(int startPc, int length, int nameIndex, - int descIndex, int index) { - entries.add(new Entry(startPc, length, nameIndex, descIndex, index)); - } - - public void addEntry(int startPc, int length, String name, - String desc, int index) { - Entry e = new Entry(startPc, length, name, desc, index); - Entry other = getEntry(index); - if (other != null) { - assert other.nameIndex == e.nameIndex && other.descIndex == e.descIndex - : e + " already declared as " + other; - } else - entries.add(e); - } - - public void addEntry(int startPc, int length, String name, String desc) { - entries.add(new Entry(startPc, length, name, desc)); - } - - public String getName() { return "LocalVariableTable"; } - - // Follows javap output format for LocalVariableTable attribute. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" LocalVariableTable: "); - buf.append("\n Start Length Slot Name Signature"); - for (Iterator it = entries.iterator(); it.hasNext(); ) { - buf.append("\n "); - Entry e = (Entry)it.next(); - Utf8Entry name = (Utf8Entry)pool.lookupEntry(e.nameIndex); - Utf8Entry sig = (Utf8Entry)pool.lookupEntry(e.descIndex); - buf.append(e.startPc); - buf.append(" "); - buf.append(e.length); - buf.append(" "); - buf.append(e.index); - buf.append(" "); - buf.append(name.getValue()); - buf.append(" "); - buf.append(sig.getValue()); - } - buf.append("\n"); - return buf.toString(); - } - - public int getMaxLocals() { - return localVariableIndex; - } - - public int getSize() { - return 2 + entries.size() * 10; - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(entries.size()); - for (Iterator it = entries.iterator(); it.hasNext(); ) { - Entry e = (Entry)it.next(); - stream.writeShort(e.startPc); - stream.writeShort(e.length); - stream.writeShort(e.nameIndex); - stream.writeShort(e.descIndex); - stream.writeShort(e.index); - } - } - - private Entry getEntry(int index) { - Entry e = null; - try { e = (Entry)entries.get(index); } catch (Exception ex) {} - return e; - } - - private class Entry { - int startPc; - int length; - int nameIndex; - int descIndex; - int index; - - public Entry(int startPc, int length, int nameIndex, int descIndex, int index) { - this.startPc = startPc; - this.length = length; - this.nameIndex = nameIndex; - this.descIndex = descIndex; - this.index = index; - localVariableIndex += length; - } - - public Entry(int startPc, int length, String name, String desc, int index) { - this(startPc, length, pool.addUtf8(name), pool.addUtf8(desc), index); - } - - public Entry(int startPc, int length, String name, String desc) { - this(startPc, length, pool.addUtf8(name), pool.addUtf8(desc), localVariableIndex); - } - - /** Two entries are equal if they refer to the same index. - */ - public boolean equals(Object other) { - if (other instanceof Entry) { - Entry otherEntry = (Entry) other; - return otherEntry.index == this.index; - } - return false; - } - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JMember.java b/src/fjbg/ch/epfl/lamp/fjbg/JMember.java deleted file mode 100644 index 6356cc874d..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JMember.java +++ /dev/null @@ -1,109 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -/** - * Abstract superclass for a Java class, field or method. - * - * @author Nikolay Mihaylov - * @version 1.0 - */ - -abstract public class JMember { - - protected boolean frozen = false; - - protected final FJBGContext context; - - protected String name; - - protected int accessFlags; - - protected final List/*<JAttribute>*/ attributes = new LinkedList(); - - protected JMember(FJBGContext context) { this.context = context; } - - protected JMember(FJBGContext context, int accessFlags, String name) { - this(context); - this.name = name; - this.accessFlags = accessFlags; - } - - /** - * Gets the access flags of the class. - * @return The int representing the access flags of the class. - */ - public int getAccessFlags() { return accessFlags; } - - /** - * Gets the name of the member. - * @return The string representing the name of the member. - */ - public String getName() { return name; } - - /** - * Gets the type of the objects that are instances of the class. - * @return The type of the instances of the class. - */ - public abstract JType getType(); - - /** - * Gets the class corresponding to/owning this member - * @return The class owning this member or the class itself. - */ - public abstract JClass getJClass(); - - /** - * Gets the constant pool of the class. - * @return The constant pool of the class. - */ - public JConstantPool getConstantPool() { return getJClass().getConstantPool(); } - - public FJBGContext getContext() { return context; } - - /** - * Adds an attribute to the class. - * @param attr The attribute to be added. - */ - public void addAttribute(JAttribute attr) { - assert !frozen; - attributes.add(attr); - } - - /** - * Gets the list of all attributes of the class. - * @return The list of the attributes of the class representation. - */ - public List/*<JAttribute>*/ getAttributes() { - return attributes; - } - - /** - * Get the attribute with the given name, or null if it doesn't - * exist. - */ - public JAttribute getAttribute(String name) { - Iterator attrIt = getAttributes().iterator(); - while (attrIt.hasNext()) { - JAttribute attr = (JAttribute)attrIt.next(); - if (attr.getName().equals(name)) - return attr; - } - return null; - } - - protected static String toExternalName(String name) { - return name.replace('/', '.'); - } - - protected static String toExternalName(JType tpe) { - return tpe.toString().replace(':', '.'); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JMethod.java b/src/fjbg/ch/epfl/lamp/fjbg/JMethod.java deleted file mode 100644 index 01d58a45c7..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JMethod.java +++ /dev/null @@ -1,199 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.IOException; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -/** - * Representation of a Java method. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JMethod extends JFieldOrMethod { - public final static String CLASS_CONSTRUCTOR_NAME = "<clinit>"; - public final static String INSTANCE_CONSTRUCTOR_NAME = "<init>"; - - protected /*final*/ JCode code; - protected final String[] argNames; - - protected final LinkedList/*<JLocalVariable>*/ localVariables = - new LinkedList(); - protected int localVariableIndex = 0; - - - protected JMethod(FJBGContext context, - JClass owner, - int accessFlags, - String name, - JType returnType, - JType[] argTypes, - String[] argNames) { - super(context, - owner, - accessFlags, - name, - new JMethodType(returnType, argTypes)); - this.argNames = argNames; - - assert argTypes.length == argNames.length; - - if (isAbstract() || isNative()) { - code = null; - } else { - code = context.JCode(owner, this); - addAttribute(context.JCodeAttribute(owner, this)); - - if (!isStatic()) - addNewLocalVariable(owner.getType(), "this"); - - for (int i = 0; i < argTypes.length; ++i) - addNewLocalVariable(argTypes[i], argNames[i]); - } - } - - protected JMethod(FJBGContext context, - JClass owner, - DataInputStream stream) - throws IOException { - super(context, owner, stream); - - assert isAbstract() || isNative() || code != null; - - int n = 0; - if (code != null) { - for (Iterator it = code.getAttributes().iterator(); it.hasNext(); ) { - JAttribute attr = (JAttribute)it.next(); - if (attr instanceof JLocalVariableTableAttribute) - n = ((JLocalVariableTableAttribute)attr).getMaxLocals(); - } - } - this.localVariableIndex = n; - - - JType[] argTypes = ((JMethodType)getType()).getArgumentTypes(); - argNames = new String[argTypes.length]; // TODO get from attribute - for (int i = 0; i < argNames.length; ++i) - argNames[i] = "v"+i; - } - - public void freeze() throws JCode.OffsetTooBigException { - if (code != null) code.freeze(); - super.freeze(); - } - - public JType getReturnType() { - return ((JMethodType)type).getReturnType(); - } - - public JType[] getArgumentTypes() { - return ((JMethodType)type).getArgumentTypes(); - } - - public int getArgsSize() { - int size = ((JMethodType)type).getArgsSize(); - if (!isStatic()) size += 1; // for this - return size; - } - - public String[] getArgumentNames() { - return argNames; - } - - public JCode getCode() { - assert !isAbstract(); - return code; - } - - // Invoked by the JCode constructor - protected void setCode(JCode code) { - assert null == this.code; - this.code = code; - } - - public JCodeIterator codeIterator() { - return new JCodeIterator(code); - } - - // Local variables - // FIXME : find a better management method for local variables - public JLocalVariable addNewLocalVariable(JType type, String name) { - assert !frozen; - JLocalVariable var = - context.JLocalVariable(this, type, name, localVariableIndex); - localVariableIndex += type.getSize(); - localVariables.add(var); - return var; - } - - public JLocalVariable getLocalVariable(int index) { - for (int i = 0; i < localVariables.size(); i++) { - if (((JLocalVariable)localVariables.get(i)).index == index) - return (JLocalVariable)localVariables.get(i); - } - return null; - } - - public JLocalVariable[] getLocalVariables() { - return (JLocalVariable[])localVariables - .toArray(new JLocalVariable[localVariables.size()]); - } - - - public int getMaxLocals() { - return localVariableIndex; - } - - // Follows javap output format for methods. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(flagsToString()); - String name = getName(); - if (CLASS_CONSTRUCTOR_NAME.equals(name)) - buf.append("{}"); - else { - if (INSTANCE_CONSTRUCTOR_NAME.equals(name)) - name = getOwner().getName(); - else { - buf.append(toExternalName(getReturnType())); - buf.append(" "); - } - buf.append(toExternalName(name)); - buf.append("("); - JType[] ts = getArgumentTypes(); - for (int i = 0; i < ts.length; ++i) { - if (i > 0) buf.append(", "); - buf.append(toExternalName(ts[i])); - } - buf.append(")"); - } - buf.append(";\n"); - Iterator it = attributes.iterator(); - while(it.hasNext()) { - JAttribute attr = (JAttribute)it.next(); - buf.append(attr); - } - return buf.toString(); - } - - private String flagsToString() { - StringBuffer buf = new StringBuffer(); - if (isPublic()) buf.append("public "); - else if (isProtected()) buf.append("protected "); - else if (isPrivate()) buf.append("private "); - if (isBridge()) buf.append("<bridge> "); - if (hasVarargs()) buf.append("<varargs> "); - if (isStatic()) buf.append("static "); - else if (isNative()) buf.append("native "); - if (isAbstract()) buf.append("abstract "); - else if (isFinal()) buf.append("final "); - return buf.toString(); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JMethodType.java b/src/fjbg/ch/epfl/lamp/fjbg/JMethodType.java deleted file mode 100644 index cd3d71fd9c..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JMethodType.java +++ /dev/null @@ -1,87 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Type for Java methods. These types do not really exist in Java, but - * are provided here because they are useful in several places. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JMethodType extends JType { - protected final JType returnType; - protected final JType[] argTypes; - protected String signature = null; - - public final static JMethodType ARGLESS_VOID_FUNCTION = - new JMethodType(JType.VOID, JType.EMPTY_ARRAY); - - public JMethodType(JType returnType, JType[] argTypes) { - this.returnType = returnType; - this.argTypes = argTypes; - } - - public JType getReturnType() { return returnType; } - public JType[] getArgumentTypes() { return argTypes; } - - public int getSize() { - throw new UnsupportedOperationException(); - } - - public String getSignature() { - if (signature == null) { - StringBuffer buf = new StringBuffer(); - buf.append('('); - for (int i = 0; i < argTypes.length; ++i) - buf.append(argTypes[i].getSignature()); - buf.append(')'); - buf.append(returnType.getSignature()); - signature = buf.toString(); - } - return signature; - } - - public int getTag() { return T_UNKNOWN; } - - public String toString() { - StringBuffer buf = new StringBuffer(); - buf.append('('); - for (int i = 0; i < argTypes.length; ++i) - buf.append(argTypes[i].toString()); - buf.append(')'); - buf.append(returnType.toString()); - return buf.toString(); - } - - public int getArgsSize() { - int size = 0; - for (int i = 0; i < argTypes.length; ++i) - size += argTypes[i].getSize(); - return size; - } - - public int getProducedStack() { - return returnType.getSize() - getArgsSize(); - } - - public boolean isCompatibleWith(JType other) { - return false; - } - public boolean equals(Object o) { - if (o instanceof JMethodType) - return ((JMethodType)o).getSignature().equals(this.getSignature()); - else - return false; - } - public int hashCode() { - if (signature == null) - return 0; - else - return signature.hashCode(); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JObjectType.java b/src/fjbg/ch/epfl/lamp/fjbg/JObjectType.java deleted file mode 100644 index 06db5b115a..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JObjectType.java +++ /dev/null @@ -1,65 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Types for Java objects. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JObjectType extends JReferenceType { - protected final String name; - protected String signature = null; - - public final static JObjectType JAVA_LANG_OBJECT = - new JObjectType("java.lang.Object"); - public final static JObjectType JAVA_LANG_STRING = - new JObjectType("java.lang.String"); - public final static JObjectType CLONEABLE = - new JObjectType("Cloneable"); - public final static JObjectType JAVA_IO_SERIALIZABLE = - new JObjectType("java.io.Serializable"); - - public JObjectType(String name) { - this.name = name; - } - - public int getSize() { return 1; } - - public String getName() { return name; } - - public String getSignature() { - if (signature == null) - signature = "L" + name.replace('.','/') + ";"; - return signature; - } - - public String getDescriptor() { - return name.replace('.','/'); - } - - public int getTag() { return T_OBJECT; } - - public String toString() { return name; } - - public boolean isObjectType() { return true; } - - public boolean isCompatibleWith(JType other) { - return other instanceof JObjectType - || other == JType.REFERENCE; - } - public boolean equals(Object o) { - if (o instanceof JObjectType) - return ((JObjectType)o).getSignature().equals(this.getSignature()); - else - return false; - } - public int hashCode() { - return name.hashCode(); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JOpcode.java b/src/fjbg/ch/epfl/lamp/fjbg/JOpcode.java deleted file mode 100644 index cc68681a96..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JOpcode.java +++ /dev/null @@ -1,1267 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Definition of opcodes for the JVM. - * - * @author Michel Schinz, Thomas Friedli - * @version 1.0 - */ - -public class JOpcode { - public final String name; - public final int code; - - // The following attributes can be (statically) unknown for some - // instructions, and are therefore not public. To know their value, - // functions have to be used (see JCodeIterator). - protected final int size; - protected final JType[] producedDataTypes; - protected final JType[] consumedDataTypes; - protected final int jumpKind; - protected final int successorCount; - - protected final static int UNKNOWN = Integer.MIN_VALUE; - - protected final static int JMP_NONE = 0; - protected final static int JMP_NEXT = 1; - protected final static int JMP_ALWAYS_S2_OFFSET = 2; - protected final static int JMP_ALWAYS_S4_OFFSET = 3; - protected final static int JMP_MAYBE_S2_OFFSET = 4; - protected final static int JMP_TABLE = 5; - protected final static int JMP_LOOKUP = 6; - - protected final static JType[] NO_DATA = new JType[0]; - - protected final static JType[] INT_TYPE = - new JType[] { JType.INT }; - protected final static JType[] FLOAT_TYPE = - new JType[] { JType.FLOAT }; - protected final static JType[] LONG_TYPE = - new JType[] { JType.LONG }; - protected final static JType[] DOUBLE_TYPE = - new JType[] { JType.DOUBLE }; - protected final static JType[] OBJECT_REF_TYPE = - new JType[] { JObjectType.JAVA_LANG_OBJECT }; - protected final static JType[] ARRAY_REF_TYPE = - new JType[] { new JArrayType(JType.VOID) }; - protected final static JType[] REFERENCE_TYPE = - new JType[] { JType.REFERENCE }; - protected final static JType[] ADDRESS_TYPE = - new JType[] { JType.ADDRESS }; - protected final static JType[] UNKNOWN_TYPE = - new JType[] { JType.UNKNOWN }; - - /// Instruction codes - public final static int cNOP = 0; - public final static int cACONST_NULL = 1; - public final static int cICONST_M1 = 2; - public final static int cICONST_0 = 3; - public final static int cICONST_1 = 4; - public final static int cICONST_2 = 5; - public final static int cICONST_3 = 6; - public final static int cICONST_4 = 7; - public final static int cICONST_5 = 8; - public final static int cLCONST_0 = 9; - public final static int cLCONST_1 = 10; - public final static int cFCONST_0 = 11; - public final static int cFCONST_1 = 12; - public final static int cFCONST_2 = 13; - public final static int cDCONST_0 = 14; - public final static int cDCONST_1 = 15; - public final static int cBIPUSH = 16; - public final static int cSIPUSH = 17; - public final static int cLDC = 18; - public final static int cLDC_W = 19; - public final static int cLDC2_W = 20; - public final static int cILOAD = 21; - public final static int cLLOAD = 22; - public final static int cFLOAD = 23; - public final static int cDLOAD = 24; - public final static int cALOAD = 25; - public final static int cILOAD_0 = 26; - public final static int cILOAD_1 = 27; - public final static int cILOAD_2 = 28; - public final static int cILOAD_3 = 29; - public final static int cLLOAD_0 = 30; - public final static int cLLOAD_1 = 31; - public final static int cLLOAD_2 = 32; - public final static int cLLOAD_3 = 33; - public final static int cFLOAD_0 = 34; - public final static int cFLOAD_1 = 35; - public final static int cFLOAD_2 = 36; - public final static int cFLOAD_3 = 37; - public final static int cDLOAD_0 = 38; - public final static int cDLOAD_1 = 39; - public final static int cDLOAD_2 = 40; - public final static int cDLOAD_3 = 41; - public final static int cALOAD_0 = 42; - public final static int cALOAD_1 = 43; - public final static int cALOAD_2 = 44; - public final static int cALOAD_3 = 45; - public final static int cIALOAD = 46; - public final static int cLALOAD = 47; - public final static int cFALOAD = 48; - public final static int cDALOAD = 49; - public final static int cAALOAD = 50; - public final static int cBALOAD = 51; - public final static int cCALOAD = 52; - public final static int cSALOAD = 53; - public final static int cISTORE = 54; - public final static int cLSTORE = 55; - public final static int cFSTORE = 56; - public final static int cDSTORE = 57; - public final static int cASTORE = 58; - public final static int cISTORE_0 = 59; - public final static int cISTORE_1 = 60; - public final static int cISTORE_2 = 61; - public final static int cISTORE_3 = 62; - public final static int cLSTORE_0 = 63; - public final static int cLSTORE_1 = 64; - public final static int cLSTORE_2 = 65; - public final static int cLSTORE_3 = 66; - public final static int cFSTORE_0 = 67; - public final static int cFSTORE_1 = 68; - public final static int cFSTORE_2 = 69; - public final static int cFSTORE_3 = 70; - public final static int cDSTORE_0 = 71; - public final static int cDSTORE_1 = 72; - public final static int cDSTORE_2 = 73; - public final static int cDSTORE_3 = 74; - public final static int cASTORE_0 = 75; - public final static int cASTORE_1 = 76; - public final static int cASTORE_2 = 77; - public final static int cASTORE_3 = 78; - public final static int cIASTORE = 79; - public final static int cLASTORE = 80; - public final static int cFASTORE = 81; - public final static int cDASTORE = 82; - public final static int cAASTORE = 83; - public final static int cBASTORE = 84; - public final static int cCASTORE = 85; - public final static int cSASTORE = 86; - public final static int cPOP = 87; - public final static int cPOP2 = 88; - public final static int cDUP = 89; - public final static int cDUP_X1 = 90; - public final static int cDUP_X2 = 91; - public final static int cDUP2 = 92; - public final static int cDUP2_X1 = 93; - public final static int cDUP2_X2 = 94; - public final static int cSWAP = 95; - public final static int cIADD = 96; - public final static int cLADD = 97; - public final static int cFADD = 98; - public final static int cDADD = 99; - public final static int cISUB = 100; - public final static int cLSUB = 101; - public final static int cFSUB = 102; - public final static int cDSUB = 103; - public final static int cIMUL = 104; - public final static int cLMUL = 105; - public final static int cFMUL = 106; - public final static int cDMUL = 107; - public final static int cIDIV = 108; - public final static int cLDIV = 109; - public final static int cFDIV = 110; - public final static int cDDIV = 111; - public final static int cIREM = 112; - public final static int cLREM = 113; - public final static int cFREM = 114; - public final static int cDREM = 115; - public final static int cINEG = 116; - public final static int cLNEG = 117; - public final static int cFNEG = 118; - public final static int cDNEG = 119; - public final static int cISHL = 120; - public final static int cLSHL = 121; - public final static int cISHR = 122; - public final static int cLSHR = 123; - public final static int cIUSHR = 124; - public final static int cLUSHR = 125; - public final static int cIAND = 126; - public final static int cLAND = 127; - public final static int cIOR = 128; - public final static int cLOR = 129; - public final static int cIXOR = 130; - public final static int cLXOR = 131; - public final static int cIINC = 132; - public final static int cI2L = 133; - public final static int cI2F = 134; - public final static int cI2D = 135; - public final static int cL2I = 136; - public final static int cL2F = 137; - public final static int cL2D = 138; - public final static int cF2I = 139; - public final static int cF2L = 140; - public final static int cF2D = 141; - public final static int cD2I = 142; - public final static int cD2L = 143; - public final static int cD2F = 144; - public final static int cI2B = 145; - public final static int cI2C = 146; - public final static int cI2S = 147; - public final static int cLCMP = 148; - public final static int cFCMPL = 149; - public final static int cFCMPG = 150; - public final static int cDCMPL = 151; - public final static int cDCMPG = 152; - public final static int cIFEQ = 153; - public final static int cIFNE = 154; - public final static int cIFLT = 155; - public final static int cIFGE = 156; - public final static int cIFGT = 157; - public final static int cIFLE = 158; - public final static int cIF_ICMPEQ = 159; - public final static int cIF_ICMPNE = 160; - public final static int cIF_ICMPLT = 161; - public final static int cIF_ICMPGE = 162; - public final static int cIF_ICMPGT = 163; - public final static int cIF_ICMPLE = 164; - public final static int cIF_ACMPEQ = 165; - public final static int cIF_ACMPNE = 166; - public final static int cGOTO = 167; - public final static int cJSR = 168; - public final static int cRET = 169; - public final static int cTABLESWITCH = 170; - public final static int cLOOKUPSWITCH = 171; - public final static int cIRETURN = 172; - public final static int cLRETURN = 173; - public final static int cFRETURN = 174; - public final static int cDRETURN = 175; - public final static int cARETURN = 176; - public final static int cRETURN = 177; - public final static int cGETSTATIC = 178; - public final static int cPUTSTATIC = 179; - public final static int cGETFIELD = 180; - public final static int cPUTFIELD = 181; - public final static int cINVOKEVIRTUAL = 182; - public final static int cINVOKESPECIAL = 183; - public final static int cINVOKESTATIC = 184; - public final static int cINVOKEINTERFACE = 185; - public final static int cNEW = 187; - public final static int cNEWARRAY = 188; - public final static int cANEWARRAY = 189; - public final static int cARRAYLENGTH = 190; - public final static int cATHROW = 191; - public final static int cCHECKCAST = 192; - public final static int cINSTANCEOF = 193; - public final static int cMONITORENTER = 194; - public final static int cMONITOREXIT = 195; - public final static int cWIDE = 196; - public final static int cMULTIANEWARRAY = 197; - public final static int cIFNULL = 198; - public final static int cIFNONNULL = 199; - public final static int cGOTO_W = 200; - public final static int cJSR_W = 201; - - // Objects representing instructions - public final static JOpcode NOP = - new JOpcode("NOP", cNOP, 1, NO_DATA, NO_DATA, JMP_NEXT); - public final static JOpcode ACONST_NULL = new JOpcode("ACONST_NULL", - cACONST_NULL, - 1, - REFERENCE_TYPE, - NO_DATA, - JMP_NEXT); - public final static JOpcode ICONST_M1 = - new JOpcode("ICONST_M1", cICONST_M1, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ICONST_0 = - new JOpcode("ICONST_0", cICONST_0, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ICONST_1 = - new JOpcode("ICONST_1", cICONST_1, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ICONST_2 = - new JOpcode("ICONST_2", cICONST_2, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ICONST_3 = - new JOpcode("ICONST_3", cICONST_3, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ICONST_4 = - new JOpcode("ICONST_4", cICONST_4, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ICONST_5 = - new JOpcode("ICONST_5", cICONST_5, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LCONST_0 = - new JOpcode("LCONST_0", cLCONST_0, 1, LONG_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LCONST_1 = - new JOpcode("LCONST_1", cLCONST_1, 1, LONG_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FCONST_0 = - new JOpcode("FCONST_0", cFCONST_0, 1, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FCONST_1 = - new JOpcode("FCONST_1", cFCONST_1, 1, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FCONST_2 = - new JOpcode("FCONST_2", cFCONST_2, 1, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode DCONST_0 = - new JOpcode("DCONST_0", cDCONST_0, 1, DOUBLE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode DCONST_1 = - new JOpcode("DCONST_1", cDCONST_1, 1, DOUBLE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode BIPUSH = - new JOpcode("BIPUSH", cBIPUSH, 2, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode SIPUSH = - new JOpcode("SIPUSH", cSIPUSH, 3, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LDC = - new JOpcode("LDC", cLDC, 2, UNKNOWN_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LDC_W = - new JOpcode("LDC_W", cLDC_W, 3, UNKNOWN_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LDC2_W = - new JOpcode("LDC2_W", cLDC2_W, 3, UNKNOWN_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ILOAD = - new JOpcode("ILOAD", cILOAD, 2, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LLOAD = - new JOpcode("LLOAD", cLLOAD, 2, LONG_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FLOAD = - new JOpcode("FLOAD", cFLOAD, 2, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode DLOAD = - new JOpcode("DLOAD", cDLOAD, 2, DOUBLE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ALOAD = - new JOpcode("ALOAD", cALOAD, 2, REFERENCE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ILOAD_0 = - new JOpcode("ILOAD_0", cILOAD_0, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ILOAD_1 = - new JOpcode("ILOAD_1", cILOAD_1, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ILOAD_2 = - new JOpcode("ILOAD_2", cILOAD_2, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ILOAD_3 = - new JOpcode("ILOAD_3", cILOAD_3, 1, INT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LLOAD_0 = - new JOpcode("LLOAD_0", cLLOAD_0, 1, LONG_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LLOAD_1 = - new JOpcode("LLOAD_1", cLLOAD_1, 1, LONG_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LLOAD_2 = - new JOpcode("LLOAD_2", cLLOAD_2, 1, LONG_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode LLOAD_3 = - new JOpcode("LLOAD_3", cLLOAD_3, 1, LONG_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FLOAD_0 = - new JOpcode("FLOAD_0", cFLOAD_0, 1, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FLOAD_1 = - new JOpcode("FLOAD_1", cFLOAD_1, 1, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FLOAD_2 = - new JOpcode("FLOAD_2", cFLOAD_2, 1, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode FLOAD_3 = - new JOpcode("FLOAD_3", cFLOAD_3, 1, FLOAT_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode DLOAD_0 = - new JOpcode("DLOAD_0", cDLOAD_0, 1, DOUBLE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode DLOAD_1 = - new JOpcode("DLOAD_1", cDLOAD_1, 1, DOUBLE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode DLOAD_2 = - new JOpcode("DLOAD_2", cDLOAD_2, 1, DOUBLE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode DLOAD_3 = - new JOpcode("DLOAD_3", cDLOAD_3, 1, DOUBLE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ALOAD_0 = - new JOpcode("ALOAD_0", cALOAD_0, 1, REFERENCE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ALOAD_1 = - new JOpcode("ALOAD_1", cALOAD_1, 1, REFERENCE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ALOAD_2 = - new JOpcode("ALOAD_2", cALOAD_2, 1, REFERENCE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode ALOAD_3 = - new JOpcode("ALOAD_3", cALOAD_3, 1, REFERENCE_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode IALOAD = - new JOpcode("IALOAD", - cIALOAD, - 1, - INT_TYPE, - new JType[] {JType.INT, JArrayType.INT}, - JMP_NEXT); - public final static JOpcode LALOAD = - new JOpcode("LALOAD", - cLALOAD, - 1, - LONG_TYPE, - new JType[] {JType.INT, JArrayType.LONG}, - JMP_NEXT); - public final static JOpcode FALOAD = - new JOpcode("FALOAD", - cFALOAD, - 1, - FLOAT_TYPE, - new JType[] {JType.INT, JArrayType.FLOAT}, - JMP_NEXT); - public final static JOpcode DALOAD = - new JOpcode("DALOAD", - cDALOAD, - 1, - DOUBLE_TYPE, - new JType[] {JType.INT, JArrayType.DOUBLE}, - JMP_NEXT); - public final static JOpcode AALOAD = - new JOpcode("AALOAD", - cAALOAD, - 1, - REFERENCE_TYPE, - new JType[] {JType.INT, JArrayType.REFERENCE}, - JMP_NEXT); - public final static JOpcode BALOAD = - new JOpcode("BALOAD", - cBALOAD, - 1, - INT_TYPE, - new JType[] {JType.INT, new JArrayType(JType.UNKNOWN)}, - JMP_NEXT); - public final static JOpcode CALOAD = - new JOpcode("CALOAD", - cCALOAD, - 1, - INT_TYPE, - new JType[] {JType.INT, JArrayType.CHAR}, - JMP_NEXT); - public final static JOpcode SALOAD = - new JOpcode("SALOAD", - cSALOAD, - 1, - INT_TYPE, - new JType[] {JType.INT, JArrayType.SHORT}, - JMP_NEXT); - public final static JOpcode ISTORE = - new JOpcode("ISTORE", cISTORE, 2, NO_DATA, INT_TYPE, JMP_NEXT); - public final static JOpcode LSTORE = - new JOpcode("LSTORE", cLSTORE, 2, NO_DATA, LONG_TYPE, JMP_NEXT); - public final static JOpcode FSTORE = - new JOpcode("FSTORE", cFSTORE, 2, NO_DATA, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode DSTORE = - new JOpcode("DSTORE", cDSTORE, 2, NO_DATA, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode ASTORE = - new JOpcode("ASTORE", cASTORE, 2, NO_DATA, REFERENCE_TYPE, JMP_NEXT); - public final static JOpcode ISTORE_0 = - new JOpcode("ISTORE_0", cISTORE_0, 1, NO_DATA, INT_TYPE, JMP_NEXT); - public final static JOpcode ISTORE_1 = - new JOpcode("ISTORE_1", cISTORE_1, 1, NO_DATA, INT_TYPE, JMP_NEXT); - public final static JOpcode ISTORE_2 = - new JOpcode("ISTORE_2", cISTORE_2, 1, NO_DATA, INT_TYPE, JMP_NEXT); - public final static JOpcode ISTORE_3 = - new JOpcode("ISTORE_3", cISTORE_3, 1, NO_DATA, INT_TYPE, JMP_NEXT); - public final static JOpcode LSTORE_0 = - new JOpcode("LSTORE_0", cLSTORE_0, 1, NO_DATA, LONG_TYPE, JMP_NEXT); - public final static JOpcode LSTORE_1 = - new JOpcode("LSTORE_1", cLSTORE_1, 1, NO_DATA, LONG_TYPE, JMP_NEXT); - public final static JOpcode LSTORE_2 = - new JOpcode("LSTORE_2", cLSTORE_2, 1, NO_DATA, LONG_TYPE, JMP_NEXT); - public final static JOpcode LSTORE_3 = - new JOpcode("LSTORE_3", cLSTORE_3, 1, NO_DATA, LONG_TYPE, JMP_NEXT); - public final static JOpcode FSTORE_0 = - new JOpcode("FSTORE_0", cFSTORE_0, 1, NO_DATA, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode FSTORE_1 = - new JOpcode("FSTORE_1", cFSTORE_1, 1, NO_DATA, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode FSTORE_2 = - new JOpcode("FSTORE_2", cFSTORE_2, 1, NO_DATA, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode FSTORE_3 = - new JOpcode("FSTORE_3", cFSTORE_3, 1, NO_DATA, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode DSTORE_0 = - new JOpcode("DSTORE_0", cDSTORE_0, 1, NO_DATA, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode DSTORE_1 = - new JOpcode("DSTORE_1", cDSTORE_1, 1, NO_DATA, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode DSTORE_2 = - new JOpcode("DSTORE_2", cDSTORE_2, 1, NO_DATA, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode DSTORE_3 = - new JOpcode("DSTORE_3", cDSTORE_3, 1, NO_DATA, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode ASTORE_0 = new JOpcode("ASTORE_0", - cASTORE_0, - 1, - NO_DATA, - REFERENCE_TYPE, - JMP_NEXT); - public final static JOpcode ASTORE_1 = new JOpcode("ASTORE_1", - cASTORE_1, - 1, - NO_DATA, - REFERENCE_TYPE, - JMP_NEXT); - public final static JOpcode ASTORE_2 = new JOpcode("ASTORE_2", - cASTORE_2, - 1, - NO_DATA, - REFERENCE_TYPE, - JMP_NEXT); - public final static JOpcode ASTORE_3 = new JOpcode("ASTORE_3", - cASTORE_3, - 1, - NO_DATA, - REFERENCE_TYPE, - JMP_NEXT); - public final static JOpcode IASTORE = - new JOpcode("IASTORE", - cIASTORE, - 1, - NO_DATA, - new JType[] { JType.INT, - JType.INT, - JArrayType.INT}, - JMP_NEXT); - public final static JOpcode LASTORE = - new JOpcode("LASTORE", - cLASTORE, - 1, - NO_DATA, - new JType[] { JType.LONG, - JType.INT, - JArrayType.LONG}, - JMP_NEXT); - public final static JOpcode FASTORE = - new JOpcode("FASTORE", - cFASTORE, - 1, - NO_DATA, - new JType[] { JType.FLOAT, - JType.INT, - JArrayType.FLOAT}, - JMP_NEXT); - public final static JOpcode DASTORE = - new JOpcode("DASTORE", - cDASTORE, - 1, - NO_DATA, - new JType[] { JType.DOUBLE, - JType.INT, - JArrayType.DOUBLE}, - JMP_NEXT); - public final static JOpcode AASTORE = - new JOpcode("AASTORE", - cAASTORE, - 1, - NO_DATA, - new JType[] { JType.REFERENCE, - JType.INT, - JArrayType.REFERENCE}, - JMP_NEXT); - public final static JOpcode BASTORE = - new JOpcode("BASTORE", - cBASTORE, - 1, - NO_DATA, - new JType[] { JType.INT, - JType.INT, - new JArrayType(JType.UNKNOWN)}, - JMP_NEXT); - public final static JOpcode CASTORE = - new JOpcode("CASTORE", - cCASTORE, - 1, - NO_DATA, - new JType[] { JType.INT, - JType.INT, - JArrayType.CHAR}, - JMP_NEXT); - public final static JOpcode SASTORE = - new JOpcode("SASTORE", - cSASTORE, - 1, - NO_DATA, - new JType[] { JType.INT, - JType.INT, - JArrayType.SHORT}, - JMP_NEXT); - public final static JOpcode POP = - new JOpcode("POP", cPOP, 1, NO_DATA, UNKNOWN_TYPE, JMP_NEXT); - public final static JOpcode POP2 = - new JOpcode("POP2", cPOP2, 1, NO_DATA, UNKNOWN_TYPE, JMP_NEXT); - public final static JOpcode DUP = - new JOpcode("DUP", cDUP, 1, UNKNOWN_TYPE, UNKNOWN_TYPE, JMP_NEXT); - public final static JOpcode DUP_X1 = new JOpcode("DUP_X1", - cDUP_X1, - 1, - UNKNOWN_TYPE, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode DUP_X2 = new JOpcode("DUP_X2", - cDUP_X2, - 1, - UNKNOWN_TYPE, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode DUP2 = - new JOpcode("DUP2", cDUP2, 1, UNKNOWN_TYPE, UNKNOWN_TYPE, JMP_NEXT); - public final static JOpcode DUP2_X1 = new JOpcode("DUP2_X1", - cDUP2_X1, - 1, - UNKNOWN_TYPE, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode DUP2_X2 = new JOpcode("DUP2_X2", - cDUP2_X2, - 1, - UNKNOWN_TYPE, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode SWAP = - new JOpcode("SWAP", cSWAP, 1, UNKNOWN_TYPE, UNKNOWN_TYPE, JMP_NEXT); - public final static JOpcode IADD = - new JOpcode("IADD", - cIADD, - 1, - INT_TYPE, - new JType[] { JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LADD = - new JOpcode("LADD", - cLADD, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode FADD = - new JOpcode("FADD", - cFADD, - 1, - FLOAT_TYPE, - new JType[] { JType.FLOAT, JType.FLOAT }, - JMP_NEXT); - public final static JOpcode DADD = - new JOpcode("DADD", - cDADD, - 1, - DOUBLE_TYPE, - new JType[] { JType.DOUBLE, JType.DOUBLE }, - JMP_NEXT); - public final static JOpcode ISUB = - new JOpcode("ISUB", - cISUB, - 1, - INT_TYPE, - new JType[] {JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LSUB = - new JOpcode("LSUB", - cLSUB, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode FSUB = - new JOpcode("FSUB", - cFSUB, - 1, - FLOAT_TYPE, - new JType[] { JType.FLOAT, JType.FLOAT }, - JMP_NEXT); - public final static JOpcode DSUB = - new JOpcode("DSUB", - cDSUB, - 1, - DOUBLE_TYPE, - new JType[] { JType.DOUBLE, JType.DOUBLE }, - JMP_NEXT); - public final static JOpcode IMUL = - new JOpcode("IMUL", - cIMUL, - 1, - INT_TYPE, - new JType[] {JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LMUL = - new JOpcode("LMUL", - cLMUL, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode FMUL = - new JOpcode("FMUL", - cFMUL, - 1, - FLOAT_TYPE, - new JType[] { JType.FLOAT, JType.FLOAT }, - JMP_NEXT); - public final static JOpcode DMUL = - new JOpcode("DMUL", - cDMUL, - 1, - DOUBLE_TYPE, - new JType[] { JType.DOUBLE, JType.DOUBLE }, - JMP_NEXT); - public final static JOpcode IDIV = - new JOpcode("IDIV", - cIDIV, - 1, - INT_TYPE, - new JType[] {JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LDIV = - new JOpcode("LDIV", - cLDIV, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode FDIV = - new JOpcode("FDIV", - cFDIV, - 1, - FLOAT_TYPE, - new JType[] { JType.FLOAT, JType.FLOAT }, - JMP_NEXT); - public final static JOpcode DDIV = - new JOpcode("DDIV", - cDDIV, - 1, - DOUBLE_TYPE, - new JType[] { JType.DOUBLE, JType.DOUBLE }, - JMP_NEXT); - public final static JOpcode IREM = - new JOpcode("IREM", - cIREM, - 1, - INT_TYPE, - new JType[] {JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LREM = - new JOpcode("LREM", - cLREM, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode FREM = - new JOpcode("FREM", - cFREM, - 1, - FLOAT_TYPE, - new JType[] { JType.FLOAT, JType.FLOAT }, - JMP_NEXT); - public final static JOpcode DREM = - new JOpcode("DREM", - cDREM, - 1, - DOUBLE_TYPE, - new JType[] { JType.DOUBLE, JType.DOUBLE }, - JMP_NEXT); - public final static JOpcode INEG = - new JOpcode("INEG", cINEG, 1, INT_TYPE, INT_TYPE, JMP_NEXT); - public final static JOpcode LNEG = - new JOpcode("LNEG", cLNEG, 1, LONG_TYPE, LONG_TYPE, JMP_NEXT); - public final static JOpcode FNEG = - new JOpcode("FNEG", cFNEG, 1, FLOAT_TYPE, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode DNEG = - new JOpcode("DNEG", cDNEG, 1, DOUBLE_TYPE, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode ISHL = - new JOpcode("ISHL", cISHL, - 1, - INT_TYPE, - new JType[] { JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LSHL = - new JOpcode("LSHL", - cLSHL, - 1, - LONG_TYPE, - new JType [] { JType.INT, JType.LONG }, - JMP_NEXT); - public final static JOpcode ISHR = - new JOpcode("ISHR", - cISHR, - 1, - INT_TYPE, - new JType[] { JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LSHR = - new JOpcode("LSHR", - cLSHR, - 1, - LONG_TYPE, - new JType[] { JType.INT, JType.LONG }, - JMP_NEXT); - public final static JOpcode IUSHR = - new JOpcode("IUSHR", - cIUSHR, - 1, - INT_TYPE, - new JType[] { JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LUSHR = - new JOpcode("LUSHR", - cLUSHR, - 1, - LONG_TYPE, - new JType[] { JType.INT, JType.LONG }, - JMP_NEXT); - public final static JOpcode IAND = - new JOpcode("IAND", - cIAND, - 1, - INT_TYPE, - new JType[] { JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LAND = - new JOpcode("LAND", - cLAND, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode IOR = - new JOpcode("IOR", - cIOR, - 1, - INT_TYPE, - new JType[] { JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LOR = - new JOpcode("LOR", - cLOR, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode IXOR = - new JOpcode("IXOR", - cIXOR, - 1, - INT_TYPE, - new JType[] { JType.INT, JType.INT }, - JMP_NEXT); - public final static JOpcode LXOR = - new JOpcode("LXOR", - cLXOR, - 1, - LONG_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode IINC = - new JOpcode("IINC", cIINC, 3, NO_DATA, NO_DATA, JMP_NEXT); - public final static JOpcode I2L = - new JOpcode("I2L", cI2L, 1, LONG_TYPE, INT_TYPE, JMP_NEXT); - public final static JOpcode I2F = - new JOpcode("I2F", cI2F, 1, FLOAT_TYPE, INT_TYPE, JMP_NEXT); - public final static JOpcode I2D = - new JOpcode("I2D", cI2D, 1, DOUBLE_TYPE, INT_TYPE, JMP_NEXT); - public final static JOpcode L2I = - new JOpcode("L2I", cL2I, 1, INT_TYPE, LONG_TYPE, JMP_NEXT); - public final static JOpcode L2F = - new JOpcode("L2F", cL2F, 1, FLOAT_TYPE, LONG_TYPE, JMP_NEXT); - public final static JOpcode L2D = - new JOpcode("L2D", cL2D, 1, DOUBLE_TYPE, LONG_TYPE, JMP_NEXT); - public final static JOpcode F2I = - new JOpcode("F2I", cF2I, 1, INT_TYPE, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode F2L = - new JOpcode("F2L", cF2L, 1, LONG_TYPE, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode F2D = - new JOpcode("F2D", cF2D, 1, DOUBLE_TYPE, FLOAT_TYPE, JMP_NEXT); - public final static JOpcode D2I = - new JOpcode("D2I", cD2I, 1, INT_TYPE, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode D2L = - new JOpcode("D2L", cD2L, 1, LONG_TYPE, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode D2F = - new JOpcode("D2F", cD2F, 1, FLOAT_TYPE, DOUBLE_TYPE, JMP_NEXT); - public final static JOpcode I2B = - new JOpcode("I2B", cI2B, 1, INT_TYPE, INT_TYPE, JMP_NEXT); - public final static JOpcode I2C = - new JOpcode("I2C", cI2C, 1, INT_TYPE, INT_TYPE, JMP_NEXT); - public final static JOpcode I2S = - new JOpcode("I2S", cI2S, 1, INT_TYPE, INT_TYPE, JMP_NEXT); - public final static JOpcode LCMP = - new JOpcode("LCMP", - cLCMP, - 1, - INT_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode FCMPL = - new JOpcode("FCMPL", - cFCMPL, - 1, - INT_TYPE, - new JType[] { JType.FLOAT, JType.FLOAT }, - JMP_NEXT); - public final static JOpcode FCMPG = - new JOpcode("FCMPG", - cFCMPG, - 1, - INT_TYPE, - new JType[] { JType.FLOAT, JType.FLOAT }, - JMP_NEXT); - public final static JOpcode DCMPL = - new JOpcode("DCMPL", - cDCMPL, - 1, - INT_TYPE, - new JType[] { JType.LONG, JType.LONG }, - JMP_NEXT); - public final static JOpcode DCMPG = - new JOpcode("DCMPG", - cDCMPG, - 1, - INT_TYPE, - new JType[] { JType.DOUBLE, JType.DOUBLE }, - JMP_NEXT); - public final static JOpcode IFEQ = - new JOpcode("IFEQ", cIFEQ, 3, NO_DATA, INT_TYPE, JMP_MAYBE_S2_OFFSET); - public final static JOpcode IFNE = - new JOpcode("IFNE", cIFNE, 3, NO_DATA, INT_TYPE, JMP_MAYBE_S2_OFFSET); - public final static JOpcode IFLT = - new JOpcode("IFLT", cIFLT, 3, NO_DATA, INT_TYPE, JMP_MAYBE_S2_OFFSET); - public final static JOpcode IFGE = - new JOpcode("IFGE", cIFGE, 3, NO_DATA, INT_TYPE, JMP_MAYBE_S2_OFFSET); - public final static JOpcode IFGT = - new JOpcode("IFGT", cIFGT, 3, NO_DATA, INT_TYPE, JMP_MAYBE_S2_OFFSET); - public final static JOpcode IFLE = - new JOpcode("IFLE", cIFLE, 3, NO_DATA, INT_TYPE, JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ICMPEQ = - new JOpcode("IF_ICMPEQ", - cIF_ICMPEQ, - 3, - NO_DATA, - new JType[] { JType.INT, JType.INT }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ICMPNE = - new JOpcode("IF_ICMPNE", - cIF_ICMPNE, - 3, - NO_DATA, - new JType[] { JType.INT, JType.INT }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ICMPLT = - new JOpcode("IF_ICMPLT", - cIF_ICMPLT, - 3, - NO_DATA, - new JType[] { JType.INT, JType.INT }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ICMPGE = - new JOpcode("IF_ICMPGE", - cIF_ICMPGE, - 3, - NO_DATA, - new JType[] { JType.INT, JType.INT }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ICMPGT = - new JOpcode("IF_ICMPGT", - cIF_ICMPGT, - 3, - NO_DATA, - new JType[] { JType.INT, JType.INT }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ICMPLE = - new JOpcode("IF_ICMPLE", - cIF_ICMPLE, - 3, - NO_DATA, - new JType[] { JType.INT, JType.INT }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ACMPEQ = - new JOpcode("IF_ACMPEQ", - cIF_ACMPEQ, - 3, - NO_DATA, - new JType[] { JType.REFERENCE, JType.REFERENCE }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IF_ACMPNE = - new JOpcode("IF_ACMPNE", - cIF_ACMPNE, - 3, - NO_DATA, - new JType[] { JType.REFERENCE, JType.REFERENCE }, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode GOTO = - new JOpcode("GOTO", cGOTO, 3, NO_DATA, NO_DATA, JMP_ALWAYS_S2_OFFSET); - public final static JOpcode JSR = - new JOpcode("JSR", cJSR, 3, ADDRESS_TYPE, NO_DATA, JMP_ALWAYS_S2_OFFSET); - public final static JOpcode RET = - new JOpcode("RET", cRET, 2, NO_DATA, NO_DATA, JMP_NONE); - public final static JOpcode TABLESWITCH = new JOpcode("TABLESWITCH", - cTABLESWITCH, - UNKNOWN, - NO_DATA, - INT_TYPE, - JMP_TABLE); - public final static JOpcode LOOKUPSWITCH = new JOpcode("LOOKUPSWITCH", - cLOOKUPSWITCH, - UNKNOWN, - NO_DATA, - INT_TYPE, - JMP_LOOKUP); - public final static JOpcode IRETURN = - new JOpcode("IRETURN", cIRETURN, 1, NO_DATA, INT_TYPE, JMP_NONE); - public final static JOpcode LRETURN = - new JOpcode("LRETURN", cLRETURN, 1, NO_DATA, LONG_TYPE, JMP_NONE); - public final static JOpcode FRETURN = - new JOpcode("FRETURN", cFRETURN, 1, NO_DATA, FLOAT_TYPE, JMP_NONE); - public final static JOpcode DRETURN = - new JOpcode("DRETURN", cDRETURN, 1, NO_DATA, DOUBLE_TYPE, JMP_NONE); - public final static JOpcode ARETURN = new JOpcode("ARETURN", - cARETURN, - 1, - NO_DATA, - OBJECT_REF_TYPE, - JMP_NONE); - public final static JOpcode RETURN = - new JOpcode("RETURN", cRETURN, 1, NO_DATA, NO_DATA, JMP_NONE); - public final static JOpcode GETSTATIC = new JOpcode("GETSTATIC", - cGETSTATIC, - 3, - UNKNOWN_TYPE, - NO_DATA, - JMP_NEXT); - public final static JOpcode PUTSTATIC = new JOpcode("PUTSTATIC", - cPUTSTATIC, - 3, - NO_DATA, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode GETFIELD = new JOpcode("GETFIELD", - cGETFIELD, - 3, - UNKNOWN_TYPE, - OBJECT_REF_TYPE, - JMP_NEXT); - public final static JOpcode PUTFIELD = - new JOpcode("PUTFIELD", cPUTFIELD, 3, NO_DATA, UNKNOWN_TYPE, JMP_NEXT); - public final static JOpcode INVOKEVIRTUAL = new JOpcode("INVOKEVIRTUAL", - cINVOKEVIRTUAL, - 3, - NO_DATA, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode INVOKESPECIAL = new JOpcode("INVOKESPECIAL", - cINVOKESPECIAL, - 3, - NO_DATA, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode INVOKESTATIC = new JOpcode("INVOKESTATIC", - cINVOKESTATIC, - 3, - NO_DATA, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode INVOKEINTERFACE = - new JOpcode("INVOKEINTERFACE", - cINVOKEINTERFACE, - 5, - NO_DATA, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode NEW = - new JOpcode("NEW", cNEW, 3, OBJECT_REF_TYPE, NO_DATA, JMP_NEXT); - public final static JOpcode NEWARRAY = - new JOpcode("NEWARRAY", - cNEWARRAY, - 2, - ARRAY_REF_TYPE, - INT_TYPE, - JMP_NEXT); - public final static JOpcode ANEWARRAY = - new JOpcode("ANEWARRAY", - cANEWARRAY, - 3, - ARRAY_REF_TYPE, - INT_TYPE, - JMP_NEXT); - public final static JOpcode ARRAYLENGTH = new JOpcode("ARRAYLENGTH", - cARRAYLENGTH, - 1, - INT_TYPE, - ARRAY_REF_TYPE, - JMP_NEXT); - public final static JOpcode ATHROW = new JOpcode("ATHROW", - cATHROW, - 1, - OBJECT_REF_TYPE, - OBJECT_REF_TYPE, - JMP_NONE); - public final static JOpcode CHECKCAST = new JOpcode("CHECKCAST", - cCHECKCAST, - 3, - OBJECT_REF_TYPE, - OBJECT_REF_TYPE, - JMP_NEXT); - public final static JOpcode INSTANCEOF = new JOpcode("INSTANCEOF", - cINSTANCEOF, - 3, - INT_TYPE, - OBJECT_REF_TYPE, - JMP_NEXT); - public final static JOpcode MONITORENTER = new JOpcode("MONITORENTER", - cMONITORENTER, - 1, - NO_DATA, - OBJECT_REF_TYPE, - JMP_NEXT); - public final static JOpcode MONITOREXIT = new JOpcode("MONITOREXIT", - cMONITOREXIT, - 1, - NO_DATA, - OBJECT_REF_TYPE, - JMP_NEXT); - public final static JOpcode WIDE = new JOpcode("WIDE", - cWIDE, - UNKNOWN, - UNKNOWN_TYPE, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode MULTIANEWARRAY = new JOpcode("MULTIANEWARRAY", - cMULTIANEWARRAY, - 4, - ARRAY_REF_TYPE, - UNKNOWN_TYPE, - JMP_NEXT); - public final static JOpcode IFNULL = new JOpcode("IFNULL", - cIFNULL, - 3, - NO_DATA, - REFERENCE_TYPE, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode IFNONNULL = new JOpcode("IFNONNULL", - cIFNONNULL, - 3, - NO_DATA, - REFERENCE_TYPE, - JMP_MAYBE_S2_OFFSET); - public final static JOpcode GOTO_W = new JOpcode("GOTO_W", - cGOTO_W, - 5, - NO_DATA, - NO_DATA, - JMP_ALWAYS_S4_OFFSET); - public final static JOpcode JSR_W = - new JOpcode("JSR_W", cJSR_W, 5, ADDRESS_TYPE, NO_DATA, JMP_NEXT); - - public final static JOpcode[] OPCODES = { - NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, - ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, - LCONST_1, FCONST_0, FCONST_1, FCONST_2, DCONST_0, - DCONST_1, BIPUSH, SIPUSH, LDC, LDC_W, - LDC2_W, ILOAD, LLOAD, FLOAD, DLOAD, - ALOAD, ILOAD_0, ILOAD_1, ILOAD_2, ILOAD_3, - LLOAD_0, LLOAD_1, LLOAD_2, LLOAD_3, FLOAD_0, - FLOAD_1, FLOAD_2, FLOAD_3, DLOAD_0, DLOAD_1, - DLOAD_2, DLOAD_3, ALOAD_0, ALOAD_1, ALOAD_2, - ALOAD_3, IALOAD, LALOAD, FALOAD, DALOAD, - AALOAD, BALOAD, CALOAD, SALOAD, ISTORE, - LSTORE, FSTORE, DSTORE, ASTORE, ISTORE_0, - ISTORE_1, ISTORE_2, ISTORE_3, LSTORE_0, LSTORE_1, - LSTORE_2, LSTORE_3, FSTORE_0, FSTORE_1, FSTORE_2, - FSTORE_3, DSTORE_0, DSTORE_1, DSTORE_2, DSTORE_3, - ASTORE_0, ASTORE_1, ASTORE_2, ASTORE_3, IASTORE, - LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, - CASTORE, SASTORE, POP, POP2, DUP, - DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, - SWAP, IADD, LADD, FADD, DADD, - ISUB, LSUB, FSUB, DSUB, IMUL, - LMUL, FMUL, DMUL, IDIV, LDIV, - FDIV, DDIV, IREM, LREM, FREM, - DREM, INEG, LNEG, FNEG, DNEG, - ISHL, LSHL, ISHR, LSHR, IUSHR, - LUSHR, IAND, LAND, IOR, LOR, - IXOR, LXOR, IINC, I2L, I2F, - I2D, L2I, L2F, L2D, F2I, - F2L, F2D, D2I, D2L, D2F, - I2B, I2C, I2S, LCMP, FCMPL, - FCMPG, DCMPL, DCMPG, IFEQ, IFNE, - IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ, - IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, - IF_ACMPEQ, IF_ACMPNE, GOTO, JSR, RET, - TABLESWITCH, LOOKUPSWITCH, IRETURN, LRETURN, FRETURN, - DRETURN, ARETURN, RETURN, GETSTATIC, PUTSTATIC, - GETFIELD, PUTFIELD, INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, - INVOKEINTERFACE, null, NEW, NEWARRAY, ANEWARRAY, - ARRAYLENGTH, ATHROW, CHECKCAST, INSTANCEOF, MONITORENTER, - MONITOREXIT, WIDE, MULTIANEWARRAY, IFNULL, IFNONNULL, - GOTO_W, JSR_W - }; - - protected JOpcode(String name, - int code, - int size, - JType[] producedDataTypes, - JType[] consumedDataTypes, - int jumpKind) { - this.name = name; - this.code = code; - this.size = size; - this.producedDataTypes = producedDataTypes; - this.consumedDataTypes = consumedDataTypes; - this.jumpKind = jumpKind; - switch (jumpKind) { - case JMP_NONE: successorCount = 0; break; - case JMP_NEXT: successorCount = 1; break; - case JMP_ALWAYS_S2_OFFSET: successorCount = 1; break; - case JMP_ALWAYS_S4_OFFSET: successorCount = 1; break; - case JMP_MAYBE_S2_OFFSET: successorCount = 2; break; - case JMP_TABLE: successorCount = UNKNOWN; break; - case JMP_LOOKUP: successorCount = UNKNOWN; break; - default: successorCount = UNKNOWN; break; - } - } - - public String toString() { return name; } - protected int getSize() { return size; } - protected JType[] getProducedDataTypes() { return producedDataTypes; } - protected JType[] getConsumedDataTypes() { return consumedDataTypes; } - - protected int getProducedDataSize() { - if (producedDataTypes != UNKNOWN_TYPE) - return JType.getTotalSize(producedDataTypes); - else { - switch (code) { - case cLDC: case cLDC_W: case cBALOAD: - return 1; - case cLDC2_W: case cDUP: case cSWAP: - return 2; - case cDUP_X1: - return 3; - case cDUP_X2: case cDUP2: - return 4; - case cDUP2_X1: - return 5; - case cDUP2_X2: - return 6; - default: - throw new Error(this.toString()); - } - } - } - - protected int getConsumedDataSize() { - if (consumedDataTypes != UNKNOWN_TYPE) - return JType.getTotalSize(consumedDataTypes); - else { - switch (code) { - case cPOP: case cDUP: - return 1; - case cPOP2: case cDUP_X1: case cDUP2: case cSWAP: - return 2; - case cDUP_X2: case cDUP2_X1: - return 3; - case cDUP2_X2: - return 4; - default: - throw new Error(this.toString()); - } - } - } - - protected int getProducedDataTypesNumber() { - if (producedDataTypes != UNKNOWN_TYPE) - return producedDataTypes.length; - else { - switch (code) { - case cLDC: case cLDC_W: case cLDC2_W: case cBALOAD: - case cGETSTATIC: case cGETFIELD: - return 1; - case cDUP: case cSWAP: - return 2; - case cDUP_X2: case cDUP2: case cDUP2_X1: case cDUP2_X2: - return 2; - case cDUP_X1: - return 3; - default: - throw new Error(this.toString()); - } - } - } - - protected int getConsumedDataTypesNumber() { - if (consumedDataTypes != UNKNOWN_TYPE) - return consumedDataTypes.length; - else { - switch (code) { - case cPOP: case cDUP: case cPUTSTATIC: - return 1; - case cPUTFIELD: case cDUP_X1: case cDUP_X2: - case cDUP2: case cDUP2_X1: case cPOP2: case cSWAP: - return 2; - default: - throw new Error(this.toString()); - } - } - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JOtherAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JOtherAttribute.java deleted file mode 100644 index 50aa9d3636..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JOtherAttribute.java +++ /dev/null @@ -1,77 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * Attributes which are unknown to the JVM (or at least to this library). - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JOtherAttribute extends JAttribute { - protected final String name; - protected final byte[] contents; - protected final int length; - - public JOtherAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - byte[] contents, - int length) { - super(context, clazz, name); - this.name = name; - this.contents = contents; - this.length = length; - } - - public JOtherAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.name = name; - this.contents = new byte[size]; - this.length = size; - - stream.read(contents, 0, length); - } - - public String getName() { return name; } - - // Follows javap output format for user-defined attributes. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" "); - buf.append(name); - buf.append(": length = 0x"); - buf.append(Integer.toHexString(length).toUpperCase()); - for (int i = 0; i < length; ++i) { - if (i % 16 == 0) buf.append("\n "); - buf.append(hexString(contents[i])); - buf.append(" "); - } - buf.append("\n"); - return buf.toString(); - } - - protected int getSize() { return length; } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.write(contents, 0, length); - } - - private static final String hexString(int i) { - return ((0 <= i && i < 16) ? "0" : "")+Integer.toHexString(i).toUpperCase(); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JReferenceType.java b/src/fjbg/ch/epfl/lamp/fjbg/JReferenceType.java deleted file mode 100644 index 73d1026c04..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JReferenceType.java +++ /dev/null @@ -1,19 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -/** - * Types for Java references, i.e. arrays and objects. - * - * @author Michel Schinz - * @version 1.0 - */ - -abstract public class JReferenceType extends JType { - public boolean isReferenceType() { return true; } - - abstract public String getDescriptor(); -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JSourceFileAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JSourceFileAttribute.java deleted file mode 100644 index 3a17cb2c44..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JSourceFileAttribute.java +++ /dev/null @@ -1,69 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * Sourcefile attribute, which can be attached to class files to - * associate them with their source file. - * - * There can be no more than one SourceFile attribute in the attributes table - * of a given ClassFile structure. See section 4.8.9 of the JVM specification. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class JSourceFileAttribute extends JAttribute { - protected final String sourceFileName; - protected final int sourceFileIndex; - - public JSourceFileAttribute(FJBGContext context, - JClass clazz, - String sourceFileName) { - super(context, clazz); - this.sourceFileName = sourceFileName; - this.sourceFileIndex = clazz.getConstantPool().addUtf8(sourceFileName); - } - - public JSourceFileAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - - this.sourceFileIndex = stream.readShort(); - this.sourceFileName = clazz.getConstantPool().lookupUtf8(sourceFileIndex); - - assert name.equals(getName()); - } - - public String getName() { return "SourceFile"; } - - public String getFileName() { return sourceFileName; } - - // Follows javap output format for SourceFile attribute. - /*@Override*/ public String toString() { - StringBuffer buf = new StringBuffer(" SourceFile: \""); - buf.append(sourceFileName); - buf.append("\"\n"); - return buf.toString(); - } - - protected int getSize() { - return 2; // Short.SIZE - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(sourceFileIndex); - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JStackMapTableAttribute.java b/src/fjbg/ch/epfl/lamp/fjbg/JStackMapTableAttribute.java deleted file mode 100644 index 72a5484d40..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JStackMapTableAttribute.java +++ /dev/null @@ -1,282 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * - * @author Stephane Micheloud - * @version 1.0 - */ - -public class JStackMapTableAttribute extends JAttribute { - /** Constant pool of the current classfile. */ - private JConstantPool pool; - - /** StackMapTable entries */ - protected final List/*<Frame>*/ entries = new ArrayList(); - protected int entriesSize = 0; - protected boolean usesU2; - - public JStackMapTableAttribute(FJBGContext context, - JClass clazz, - JCode code) { - super(context, clazz); - this.pool = clazz.pool; - - assert code.getOwner().getOwner() == clazz; - } - - public JStackMapTableAttribute(FJBGContext context, - JClass clazz, - Object owner, - String name, - int size, - DataInputStream stream) - throws IOException { - super(context, clazz, name); - this.pool = clazz.pool; - - int count = stream.readShort(); - this.usesU2 = count < 65536; - for (int i = 0; i < count; ++i) - this.entries.add(new Frame(stream)); - this.entriesSize = computeSize(); - - assert name.equals(getName()); - } - - public String getName() { return "StackMapTable"; } - - // Follows javap output format for StackMapTable attribute. - /*@Override*/ public String toString() { - Frame frame = null; - StringBuffer buf = new StringBuffer(" StackMapTable: number_of_entries = "); - buf.append(entries.size()); - Iterator it = entries.iterator(); - while (it.hasNext()) { - frame = (Frame)it.next(); - buf.append("\n frame_type = "); - buf.append(frame.tag); - buf.append(" /* "); - buf.append(getFrameType(frame.tag)); - buf.append(" */"); - if (frame.offsetDelta != -1) - buf.append("\n offset_delta = "+frame.offsetDelta); - if (frame.locals != null) - appendTypeInfoArray(buf, "locals", frame.locals); - if (frame.stackItems != null) - appendTypeInfoArray(buf, "stack", frame.stackItems); - } - buf.append("\n"); - return buf.toString(); - } - - protected int getSize() { - return entriesSize; - } - - protected void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeShort(entriesSize); - Iterator it = entries.iterator(); - while (it.hasNext()) { - Frame frame = (Frame)it.next(); - frame.writeContentsTo(stream); - } - } - - private class TypeInfo { - final int tag; - final int poolIndexOrOffset; // tag == 7 => poolIndex, tag = 8 => offset - private int bytes; - TypeInfo(DataInputStream stream) throws IOException { - int size = 1; - this.tag = stream.readByte(); - if (tag == 7) { // ITEM_Object; // 7 - poolIndexOrOffset = stream.readShort(); - size += 2; - } else if (tag == 8) { // ITEM_Uninitialized // 8 - poolIndexOrOffset = (usesU2) ? stream.readShort() : stream.readInt(); - size += (usesU2) ? 2 : 4; - } else - poolIndexOrOffset = -1; - this.bytes += size; - } - int getSize() { return bytes; } - void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeByte(tag); - if (tag == 7) { // ITEM_Object; // 7 - stream.writeShort(poolIndexOrOffset); - } else if (tag == 8) { // ITEM_Uninitialized // 8 - if (usesU2) stream.writeShort(poolIndexOrOffset); - else stream.writeInt(poolIndexOrOffset); - } - } - /*@Override*/ public String toString() { - switch (tag) { - case 0: // ITEM_Top - return "<top>"; - case 1: // ITEM_Integer - return "int"; - case 2: // ITEM_Float - return "float"; - case 3: // ITEM_Double - return "double"; - case 4: // ITEM_Long - return "long"; - case 5: // ITEM_Null - return "null"; - case 6: // ITEM_UninializedThis - return "this"; - case 7: // ITEM_Object - String name = pool.lookupClass(poolIndexOrOffset); - if (name.startsWith("[")) name = "\""+name+"\""; - return "class "+name; - case 8: // ITEM_Uninitialized - return "<uninitialized>"; - default: - return String.valueOf(tag); - } - } - } - - private class Frame { - final int tag; - int offsetDelta = -1; - TypeInfo[] stackItems = null; - TypeInfo[] locals = null; - private int bytes; - Frame(DataInputStream stream) throws IOException { - // The stack_map_frame structure consists of a one-byte tag - // followed by zero or more bytes. - this.tag = stream.readUnsignedByte(); - if (tag < 64) { // SAME; // 0-63 - //done - } else if (tag < 128) { // SAME_LOCALS_1_STACK_ITEM; // 64-127 - this.offsetDelta = tag - 64; - readStackItems(stream, 1); - } else if (tag < 248) { // reserved for future use. - assert false : "Tags in the range [128-247] are reserved for future use."; - } else if (tag < 251) { // CHOP; // 248-250 - int k = 251 - tag; - readOffsetDelta(stream); - } else if (tag == 251) { // SAME_FRAME_EXTENDED - readOffsetDelta(stream); - } else if (tag < 255) { // APPEND; // 252-254 - readOffsetDelta(stream); - readLocals(stream, tag - 251); - } else { // FULL_FRAME; // 255 - readOffsetDelta(stream); - readLocals(stream); - readStackItems(stream); - } - } - int getSize() { return bytes; } - void readOffsetDelta(DataInputStream stream) throws IOException { - this.offsetDelta = (usesU2) ? stream.readShort() : stream.readInt(); - this.bytes += (usesU2) ? 2 : 4; - } - int getOffsetDelta() { return offsetDelta; } - void readStackItems(DataInputStream stream, int k) throws IOException { - this.stackItems = new TypeInfo[k]; - for (int i = 0; i < k; ++i) { - stackItems[i] = new TypeInfo(stream); - this.bytes += stackItems[i].getSize(); - } - } - void readStackItems(DataInputStream stream) throws IOException { - int k = (usesU2) ? stream.readShort() : stream.readInt(); - this.bytes += (usesU2) ? 2 : 4; - readStackItems(stream, k); - } - void readLocals(DataInputStream stream, int k) throws IOException { - this.locals = new TypeInfo[k]; - for (int i = 0; i < k; ++i) { - locals[i] = new TypeInfo(stream); - this.bytes += locals[i].getSize(); - } - } - void readLocals(DataInputStream stream) throws IOException { - int k = (usesU2) ? stream.readShort() : stream.readInt(); - this.bytes += (usesU2) ? 2 : 4; - readLocals(stream, k); - } - void writeContentsTo(DataOutputStream stream) throws IOException { - stream.writeByte(tag); - if (tag < 64) { - //done - } else if (tag < 128) { // SAME; // 0-63 - assert stackItems.length == 1; - stackItems[0].writeContentsTo(stream); - } else if (tag < 248) { - assert false : "Tags in the range [128-247] are reserved for future use."; - } else if (tag < 251) { - if (usesU2) stream.writeShort(offsetDelta); - else stream.writeInt(offsetDelta); - } else if (tag == 251) { - if (usesU2) stream.writeShort(offsetDelta); - else stream.writeInt(offsetDelta); - } else if (tag < 255) { // APPEND; // 252-254 - if (usesU2) stream.writeShort(offsetDelta); - else stream.writeInt(offsetDelta); - for (int i = 0; i < locals.length; ++i) - locals[i].writeContentsTo(stream); - } else { - if (usesU2) stream.writeShort(offsetDelta); - else stream.writeInt(offsetDelta); - for (int i = 0; i < locals.length; ++i) - locals[i].writeContentsTo(stream); - for (int i = 0; i < stackItems.length; ++i) - stackItems[i].writeContentsTo(stream); - } - } - } - - private int computeSize() { - int size = (usesU2) ? 2 : 4; // number of frames - Iterator it = entries.iterator(); - while (it.hasNext()) { - Frame frame = (Frame)it.next(); - size += frame.getSize(); - } - return size; - } - - private static final String getFrameType(int tag) { - if (tag < 64) return "same"; - else if (tag < 128) return "same locals 1 stack item"; - else if (tag < 248) return "<reserved>"; - else if (tag < 251) return "chop"; - else if (tag == 251) return "same frame extended"; - else if (tag < 255) return "append"; - else return "full frame"; - } - - private static StringBuffer appendTypeInfoArray(StringBuffer buf, - String s, TypeInfo[] a) { - buf.append("\n "); - buf.append(s); - buf.append(" = "); - if (a.length > 0) { - buf.append("[ "); - for (int i = 0; i < a.length; ++i) { - if (i > 0) buf.append(", "); - buf.append(a[i]); - } - buf.append(" ]"); - } - else - buf.append("[]"); - return buf; - } - -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JType.java b/src/fjbg/ch/epfl/lamp/fjbg/JType.java deleted file mode 100644 index 298a2b0565..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/JType.java +++ /dev/null @@ -1,316 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.IOException; -import java.io.StringReader; -import java.util.ArrayList; - -/** - * Representation of Java types. - * - * @version 1.0 - * @author Michel Schinz - */ - -abstract public class JType { - abstract public int getSize(); - abstract public String getSignature(); - abstract public int getTag(); - abstract public String toString(); - abstract public boolean isCompatibleWith(JType other); - - public boolean isValueType() { return false; } - public boolean isObjectType() { return false; } - public boolean isArrayType() { return false; } - public boolean isReferenceType() { return false; } - - // Tags for types. Taken from BCEL. - public static final int T_BOOLEAN = 4; - public static final int T_CHAR = 5; - public static final int T_FLOAT = 6; - public static final int T_DOUBLE = 7; - public static final int T_BYTE = 8; - public static final int T_SHORT = 9; - public static final int T_INT = 10; - public static final int T_LONG = 11; - public static final int T_VOID = 12; // Non-standard - public static final int T_ARRAY = 13; - public static final int T_OBJECT = 14; - public static final int T_UNKNOWN = 15; - public static final int T_ADDRESS = 16; - - public static final int T_REFERENCE = 17; // type compatible with references - - public static final JType[] EMPTY_ARRAY = new JType[0]; - - protected static JType parseSig(StringReader s) throws IOException { - int nextChar = s.read(); - if (nextChar == -1) throw new IllegalArgumentException(); - - switch ((char)nextChar) { - case 'V' : return VOID; - case 'Z' : return BOOLEAN; - case 'B' : return BYTE; - case 'C' : return CHAR; - case 'S' : return SHORT; - case 'I' : return INT; - case 'F' : return FLOAT; - case 'J' : return LONG; - case 'D' : return DOUBLE; - case 'L': { - StringBuffer className = new StringBuffer(); - for (;;) { - nextChar = s.read(); - if (nextChar == -1 || nextChar == ';') break; - className.append(nextChar == '/' ? ':' : ((char)nextChar)); - } - if (nextChar != ';') throw new IllegalArgumentException(); - return new JObjectType(className.toString()); - } - case '[': { - JType elemType = parseSig(s); - return new JArrayType(elemType); - } - case '(': { - ArrayList argTps = new ArrayList(); - for (;;) { - s.mark(1); - nextChar = s.read(); - if (nextChar == -1 || nextChar == ')') break; - s.reset(); - argTps.add(parseSig(s)); - } - if (nextChar != ')') throw new IllegalArgumentException("a"); - JType[] argTpsA = (JType[])argTps.toArray(new JType[argTps.size()]); - JType returnType = parseSig(s); - return new JMethodType(returnType, argTpsA); - } - default: - throw new IllegalArgumentException(); - } - } - - /** - * A signature is a string representing the generic type of a field or - * method, or generic type information for a class declaration. - * See section 4.4.4 of the JVM specification. - */ - public static JType parseSignature(String signature) { - try { - StringReader sigReader = new StringReader(signature); - JType parsed = parseSig(sigReader); - if (sigReader.read() != -1) - throw new IllegalArgumentException(); - return parsed; - } catch (IllegalArgumentException e) { - throw new IllegalArgumentException("invalid signature " + signature); - } catch (IOException e) { - throw new Error(e); - } - } - - public static int getTotalSize(JType[] types) { - int size = 0; - for (int i = 0; i < types.length; ++i) - size += types[i].getSize(); - return size; - } - - protected JType() {} - - public static JType VOID = new JType() { - public int getSize() { return 0; } - public String getSignature() { return "V"; } - public int getTag() { return T_VOID; } - public String toString() { return "void"; } - public boolean isCompatibleWith(JType other) { - throw new UnsupportedOperationException("type VOID is no real " - + "data type therefore " - + "cannot be assigned to " - + other.toString()); - } - }; - - public static JType BOOLEAN = new JType() { - public int getSize() { return 1; } - public String getSignature() { return "Z"; } - public int getTag() { return T_BOOLEAN; } - public String toString() { return "boolean"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == BOOLEAN - || other == INT - || other == BYTE - || other == CHAR - || other == SHORT; - } - }; - - public static JType BYTE = new JType() { - public int getSize() { return 1; } - public String getSignature() { return "B"; } - public int getTag() { return T_BYTE; } - public String toString() { return "byte"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == BOOLEAN - || other == INT - || other == BYTE - || other == CHAR - || other == SHORT; - } - }; - - public static JType CHAR = new JType() { - public int getSize() { return 1; } - public String getSignature() { return "C"; } - public int getTag() { return T_CHAR; } - public String toString() { return "char"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == BOOLEAN - || other == INT - || other == BYTE - || other == CHAR - || other == SHORT; - } - }; - - public static JType SHORT = new JType() { - public int getSize() { return 1; } - public String getSignature() { return "S"; } - public int getTag() { return T_SHORT; } - public String toString() { return "short"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == BOOLEAN - || other == INT - || other == BYTE - || other == CHAR - || other == SHORT; - } - }; - - public static JType INT = new JType() { - public int getSize() { return 1; } - public String getSignature() { return "I"; } - public int getTag() { return T_INT; } - public String toString() { return "int"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == BOOLEAN - || other == INT - || other == BYTE - || other == CHAR - || other == SHORT; - } - }; - - public static JType FLOAT = new JType() { - public int getSize() { return 1; } - public String getSignature() { return "F"; } - public int getTag() { return T_FLOAT; } - public String toString() { return "float"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == FLOAT; - } - }; - - public static JType LONG = new JType() { - public int getSize() { return 2; } - public String getSignature() { return "J"; } - public int getTag() { return T_LONG; } - public String toString() { return "long"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == LONG; - } - }; - - public static JType DOUBLE = new JType() { - public int getSize() { return 2; } - public String getSignature() { return "D"; } - public int getTag() { return T_DOUBLE; } - public String toString() { return "double"; } - public boolean isValueType() { return true; } - public boolean isCompatibleWith(JType other) { - return other == DOUBLE; - } - }; - - public static JType REFERENCE = new JType() { - public int getSize() { return 1; } - public String getSignature() { - throw new UnsupportedOperationException("type REFERENCE is no real " - + "data type and therefore " - + "has no signature"); - } - public int getTag() { return T_REFERENCE; } - public String toString() { return "<reference>"; } - public boolean isCompatibleWith(JType other) { - throw new UnsupportedOperationException("type REFERENCE is no real " - + "data type and therefore " - + "cannot be assigned to " - + other.toString()); - } - }; - - public static JType ADDRESS = new JType() { - public int getSize() { return 1; } - public String getSignature() { - throw new UnsupportedOperationException("type ADDRESS is no usable " - + "data type and therefore " - + "has no signature"); - } - public int getTag() { return T_ADDRESS; } - public String toString() { return "<address>"; } - public boolean isCompatibleWith(JType other) { - return other == ADDRESS; - } - }; - - public static JType UNKNOWN = new JType() { - public int getSize() { - throw new UnsupportedOperationException("type UNKNOWN is no real " - + "data type and therefore " - + "has no size"); - } - public String getSignature() { - throw new UnsupportedOperationException("type UNKNOWN is no real " - + "data type and therefore " - + "has no signature"); - } - public int getTag() { return T_UNKNOWN; } - public String toString() { return "<unknown>"; } - public boolean isCompatibleWith(JType other) { - throw new UnsupportedOperationException("type UNKNOWN is no real " - + "data type and therefore " - + "cannot be assigned to " - + other.toString()); - } - }; - - protected static String tagToString(int tag) { - switch (tag) { - case T_BOOLEAN : return "boolean"; - case T_CHAR : return "char"; - case T_FLOAT : return "float"; - case T_DOUBLE : return "double"; - case T_BYTE : return "byte"; - case T_SHORT : return "short"; - case T_INT : return "int"; - case T_LONG : return "long"; - case T_VOID : return "void"; // Non-standard - case T_ARRAY : return "[]"; - case T_OBJECT : return "Object"; - case T_UNKNOWN : return "<unknown>"; - case T_ADDRESS : return "<address>"; - default: return String.valueOf(tag); - } - } -} diff --git a/src/fjbg/ch/epfl/lamp/fjbg/Main.java b/src/fjbg/ch/epfl/lamp/fjbg/Main.java deleted file mode 100644 index 810ee7c400..0000000000 --- a/src/fjbg/ch/epfl/lamp/fjbg/Main.java +++ /dev/null @@ -1,131 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.fjbg; - -import java.io.DataInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.jar.JarFile; -import java.util.zip.ZipEntry; - -/** - * Main program entry to execute the FJBG reader from the command line. - * - * The reader prints out the decoded data in the same output format as - * javap, the Java bytecode disassembler of the Sun J2SE SDK. - * - * @author Stephane Micheloud - * @version 1.1 - */ - -public class Main { - private static final String PRODUCT_STRING = "Fast Java Bytecode Generator"; - private static final String VERSION_STRING = "version 1.1"; - - private static final int ACTION_USAGE = 0; - private static final int ACTION_DONE = 1; - private static final int ACTION_PROCEED = 2; - - private static String classPath = "."; - private static String[] classNames = null; - - public static void main(String[] args) { - switch (parseArgs(args)) { - case ACTION_USAGE: printUsage(); break; - case ACTION_PROCEED: processClasses(); break; - default: - } - } - - private static void processClasses() { - FJBGContext fjbgContext = new FJBGContext(49, 0); - if (classNames.length > 0) - try { - for (int i = 0; i < classNames.length; ++i) - processClass(fjbgContext, classNames[i]); - } catch (IOException e) { - System.err.println(e.getMessage()); - } - else - System.err.println( - "No classes were specified on the command line. Try -help."); - } - - private static void processClass(FJBGContext fjbgContext, String className) - throws IOException { - InputStream in = getInputStream(className); - JClass jclass = fjbgContext.JClass(new DataInputStream(in)); - System.out.println(jclass); - in.close(); - } - - private static InputStream getInputStream(String className) throws IOException { - String name = null; - String[] paths = classPath.split(File.pathSeparator); - for (int i = 0; i < paths.length; ++i) { - File parent = new File(paths[i]); - if (parent.isDirectory()) { - name = className.replace('.', File.separatorChar)+".class"; - File f = new File(parent, name); - if (f.isFile()) return new FileInputStream(f); - } else if (paths[i].endsWith(".jar")) { - JarFile f = new JarFile(parent); - name = className.replace('.', '/')+".class"; - ZipEntry e = f.getEntry(name); - if (e != null) return f.getInputStream(e); - } - } - throw new IOException("ERROR:Could not find "+className); - } - - private static int parseArgs(String[] args) { - ArrayList/*<String>*/ classes = new ArrayList(); - String arg = null; - int action = ACTION_USAGE; - int i = 0, n = args.length; - while (i < n) { - arg = args[i]; - if (arg.equals("-classpath") && (i+1) < n) { - classPath = args[i+1]; i += 2; - } else if (arg.equals("-cp") && (i+1) < n) { - classPath = args[i+1]; i += 2; - } else if (arg.equals("-help")) { - i = n+1; - //} else if (arg.equals("-v")) { - // verbose = true; i += 1; - } else if (arg.equals("-version")) { - System.err.println(PRODUCT_STRING+" "+VERSION_STRING); - action = ACTION_DONE; i = n+1; - } else if (arg.startsWith("-")) { - System.err.println("invalid flag: "+arg); - i = n+1; - } else { - classes.add(arg); i += 1; - } - } - if (i == n && i > 0) { - classNames = (String[])classes.toArray(new String[classes.size()]); - action = ACTION_PROCEED; - } - return action; - } - - private static void printUsage() { - System.out.println("Usage: fjbg <options> <classes>"); - System.out.println(); - System.out.println("where possible options include:"); - System.out.println(" -cp <path> Specify where to find user class files"); - System.out.println(" -classpath <path> Specify where to find user class files"); - System.out.println(" -help Print a synopsis of standard options"); - System.out.println(" -version Version information"); - System.out.println(); - System.exit(1); - } -} - diff --git a/src/fjbg/ch/epfl/lamp/util/ByteArray.java b/src/fjbg/ch/epfl/lamp/util/ByteArray.java deleted file mode 100644 index b852e1ac1f..0000000000 --- a/src/fjbg/ch/epfl/lamp/util/ByteArray.java +++ /dev/null @@ -1,145 +0,0 @@ -/* FJBG -- Fast Java Bytecode Generator - * Copyright 2002-2013 LAMP/EPFL - * @author Michel Schinz - */ - -package ch.epfl.lamp.util; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * Array of bytes. - * - * @author Michel Schinz - * @version 1.0 - */ - -public class ByteArray { - protected final static int BYTE_BLOCK_BITS = 8; - protected final static int BYTE_BLOCK_SIZE = 1 << BYTE_BLOCK_BITS; - protected final static int BYTE_BLOCK_MASK = BYTE_BLOCK_SIZE - 1; - - protected byte[][] data = new byte[][] { new byte[BYTE_BLOCK_SIZE] }; - protected int pos = 0; // The next free position. - - protected boolean frozen = false; - - public ByteArray() { } - - public ByteArray(InputStream stream, int size) throws IOException { - pos = size; - for (int i = 0; size > 0; ++i) { - int sizeToRead = Math.min(BYTE_BLOCK_SIZE, size); - stream.read(data[i], 0, sizeToRead); - - size -= sizeToRead; - if (size > 0) addNewBlock(); - } - } - - public void freeze() { frozen = true; } - - public int nextBytePosition() { - return pos; - } - - public int getSize() { - return pos; - } - - protected void addNewBlock() { - int nextBlockPos = pos >>> BYTE_BLOCK_BITS; - if (nextBlockPos == data.length) { - byte[][] newData = new byte[data.length * 2][]; - System.arraycopy(data, 0, newData, 0, data.length); - data = newData; - } - assert data[nextBlockPos] == null : pos + " " + nextBlockPos; - data[nextBlockPos] = new byte[BYTE_BLOCK_SIZE]; - } - - protected void addByte(int b) { - assert !frozen; - - if ((pos & BYTE_BLOCK_MASK) == 0 && pos > 0) - addNewBlock(); - int currPos = pos++; - data[currPos >>> BYTE_BLOCK_BITS][currPos & BYTE_BLOCK_MASK] = (byte)b; - } - - public void addU1(int i) { - assert i <= 0xFF : i; - addByte(i); - } - - public void addU2(int i) { - assert i <= 0xFFFF : i; - - addByte(i >>> 8); - addByte(i & 0xFF); - } - - public void addU4(int i) { - addByte(i >>> 24); - addByte((i >>> 16) & 0xFF); - addByte((i >>> 8) & 0xFF); - addByte(i & 0xFF); - } - - public void putByte(int targetPos, int b) { - assert !frozen; - assert targetPos < pos : targetPos + " >= " + pos; - - data[targetPos >>> BYTE_BLOCK_BITS][targetPos & BYTE_BLOCK_MASK] = (byte)b; - } - - public void putU2(int targetPos, int i) { - assert i < 0xFFFF : i; - putByte(targetPos, i >>> 8); - putByte(targetPos + 1, i & 0xFF); - } - - public void putU4(int targetPos, int i) { - putByte(targetPos, i >>> 24); - putByte(targetPos + 1, (i >>> 16) & 0xFF); - putByte(targetPos + 2, (i >>> 8) & 0xFF); - putByte(targetPos + 3, i & 0xFF); - } - - public int getU1(int sourcePos) { - assert sourcePos < pos : sourcePos + " >= " + pos; - return data[sourcePos >>> BYTE_BLOCK_BITS][sourcePos & BYTE_BLOCK_MASK] & 0xFF; - } - - public int getU2(int sourcePos) { - return (getU1(sourcePos) << 8) | getU1(sourcePos + 1); - } - - public int getU4(int sourcePos) { - return (getU2(sourcePos) << 16) | getU2(sourcePos + 2); - } - - public int getS1(int sourcePos) { - assert sourcePos < pos : sourcePos + " >= " + pos; - return data[sourcePos >>> BYTE_BLOCK_BITS][sourcePos & BYTE_BLOCK_MASK]; - } - - public int getS2(int sourcePos) { - return (getS1(sourcePos) << 8) | getU1(sourcePos + 1); - } - - public int getS4(int sourcePos) { - return (getS2(sourcePos) << 16) | getU2(sourcePos + 2); - } - - public void writeTo(OutputStream stream) throws IOException { - if (!frozen) freeze(); - - for (int i = 0; i < data.length && data[i] != null; ++i) { - int len = Math.min(BYTE_BLOCK_SIZE, pos - (i << BYTE_BLOCK_BITS)); - stream.write(data[i], 0, len); - } - } -} diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE index 0fcc9cbc16..f8b1f31327 100644 --- a/src/intellij/compiler.iml.SAMPLE +++ b/src/intellij/compiler.iml.SAMPLE @@ -20,7 +20,6 @@ <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="reflect" /> <orderEntry type="module" module-name="asm" /> - <orderEntry type="module" module-name="fjbg" /> <orderEntry type="library" name="ant" level="application" /> <orderEntry type="library" name="jline" level="project" /> </component> diff --git a/src/intellij/fjbg.iml.SAMPLE b/src/intellij/fjbg.iml.SAMPLE deleted file mode 100644 index 03eca69246..0000000000 --- a/src/intellij/fjbg.iml.SAMPLE +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$/../fjbg"> - <sourceFolder url="file://$MODULE_DIR$/../fjbg" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE index 130a676508..a8cb5eacc1 100644 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ b/src/intellij/scala-lang.ipr.SAMPLE @@ -198,7 +198,6 @@ <module fileurl="file://$PROJECT_DIR$/actors.iml" filepath="$PROJECT_DIR$/actors.iml" /> <module fileurl="file://$PROJECT_DIR$/asm.iml" filepath="$PROJECT_DIR$/asm.iml" /> <module fileurl="file://$PROJECT_DIR$/compiler.iml" filepath="$PROJECT_DIR$/compiler.iml" /> - <module fileurl="file://$PROJECT_DIR$/fjbg.iml" filepath="$PROJECT_DIR$/fjbg.iml" /> <module fileurl="file://$PROJECT_DIR$/forkjoin.iml" filepath="$PROJECT_DIR$/forkjoin.iml" /> <module fileurl="file://$PROJECT_DIR$/library.iml" filepath="$PROJECT_DIR$/library.iml" /> <module fileurl="file://$PROJECT_DIR$/manual.iml" filepath="$PROJECT_DIR$/manual.iml" /> @@ -229,7 +228,6 @@ <root url="file://$PROJECT_DIR$/../../build/locker/classes/library" /> <root url="file://$PROJECT_DIR$/../../build/locker/classes/compiler" /> <root url="file://$PROJECT_DIR$/../../build/locker/classes/reflect" /> - <root url="file://$PROJECT_DIR$/../../build/libs/classes/fjbg" /> <root url="file://$PROJECT_DIR$/../../build/asm/classes" /> </CLASSES> <JAVADOC /> diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE index 668ddcc356..3ce369be05 100644 --- a/src/intellij/test.iml.SAMPLE +++ b/src/intellij/test.iml.SAMPLE @@ -12,7 +12,6 @@ <orderEntry type="module" module-name="swing" /> <orderEntry type="module" module-name="partest" /> <orderEntry type="module" module-name="asm" /> - <orderEntry type="module" module-name="fjbg" /> <orderEntry type="module" module-name="forkjoin" /> </component> </module> diff --git a/src/partest/scala/tools/partest/CompilerTest.scala b/src/partest/scala/tools/partest/CompilerTest.scala index bb0732dcc6..7495f97efd 100644 --- a/src/partest/scala/tools/partest/CompilerTest.scala +++ b/src/partest/scala/tools/partest/CompilerTest.scala @@ -49,7 +49,7 @@ abstract class CompilerTest extends DirectTest { } class SymsInPackage(pkgName: String) { - def pkg = rootMirror.getRequiredPackage(pkgName) + def pkg = rootMirror.getPackage(pkgName) def classes = allMembers(pkg) filter (_.isClass) def modules = allMembers(pkg) filter (_.isModule) def symbols = classes ++ terms filterNot (_ eq NoSymbol) diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala index 7000e8280b..0ec3f60bf5 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala @@ -84,7 +84,6 @@ class ConsoleFileManager extends FileManager { latestReflectFile = testClassesDir / "reflect" latestCompFile = testClassesDir / "compiler" latestPartestFile = testClassesDir / "partest" - latestFjbgFile = testParent / "lib" / "fjbg.jar" } else if (testBuild.isDefined) { val dir = Path(testBuild.get) @@ -94,7 +93,6 @@ class ConsoleFileManager extends FileManager { latestReflectFile = dir / "lib/scala-reflect.jar" latestCompFile = dir / "lib/scala-compiler.jar" latestPartestFile = dir / "lib/scala-partest.jar" - latestFjbgFile = testParent / "lib" / "fjbg.jar" } else { def setupQuick() { @@ -152,8 +150,6 @@ class ConsoleFileManager extends FileManager { // run setup based on most recent time pairs(pairs.keys max)() - - latestFjbgFile = prefixFile("lib/fjbg.jar") } LATEST_LIB = latestLibFile.getAbsolutePath @@ -174,7 +170,6 @@ class ConsoleFileManager extends FileManager { var latestReflectFile: File = _ var latestCompFile: File = _ var latestPartestFile: File = _ - var latestFjbgFile: File = _ def latestScalapFile: File = (latestLibFile.parent / "scalap.jar").jfile var testClassesDir: Directory = _ // initialize above fields diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala index 4b0ed1f82a..d3a40718c6 100644 --- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala +++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala @@ -51,9 +51,9 @@ class ReflectiveRunner { new ConsoleFileManager import fileManager. - { latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile } + { latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestScalapFile, latestActorsFile } val files = - Array(latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile) map (x => io.File(x)) + Array(latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestScalapFile, latestActorsFile) map (x => io.File(x)) val sepUrls = files map (_.toURL) var sepLoader = new URLClassLoader(sepUrls, null) diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index e74dd0c043..8c048ed7f8 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -14,7 +14,7 @@ import scala.reflect.api.{Universe => ApiUniverse} trait Definitions extends api.StandardDefinitions { self: SymbolTable => - import rootMirror.{getModule, getClassByName, getRequiredClass, getRequiredModule, getRequiredPackage, getClassIfDefined, getModuleIfDefined, getPackageObject, getPackageObjectIfDefined, requiredClass, requiredModule} + import rootMirror.{getModule, getPackage, getClassByName, getRequiredClass, getRequiredModule, getClassIfDefined, getModuleIfDefined, getPackageObject, getPackageObjectIfDefined, requiredClass, requiredModule} object definitions extends DefinitionsClass @@ -169,11 +169,11 @@ trait Definitions extends api.StandardDefinitions { // It becomes tricky to create dedicated objects for other symbols because // of initialization order issues. - lazy val JavaLangPackage = getRequiredPackage(sn.JavaLang) + lazy val JavaLangPackage = getPackage("java.lang") lazy val JavaLangPackageClass = JavaLangPackage.moduleClass.asClass - lazy val ScalaPackage = getRequiredPackage(nme.scala_) + lazy val ScalaPackage = getPackage("scala") lazy val ScalaPackageClass = ScalaPackage.moduleClass.asClass - lazy val RuntimePackage = getRequiredPackage("scala.runtime") + lazy val RuntimePackage = getPackage("scala.runtime") lazy val RuntimePackageClass = RuntimePackage.moduleClass.asClass // convenient one-argument parameter lists diff --git a/src/reflect/scala/reflect/internal/Mirrors.scala b/src/reflect/scala/reflect/internal/Mirrors.scala index 80aa06d020..6e76a7afb3 100644 --- a/src/reflect/scala/reflect/internal/Mirrors.scala +++ b/src/reflect/scala/reflect/internal/Mirrors.scala @@ -172,14 +172,15 @@ trait Mirrors extends api.Mirrors { case _ => MissingRequirementError.notFound("package " + fullname) } - def getPackage(fullname: Name): ModuleSymbol = + def getPackage(fullname: TermName): ModuleSymbol = ensurePackageSymbol(fullname.toString, getModuleOrClass(fullname), allowModules = true) - def getRequiredPackage(fullname: String): ModuleSymbol = + @deprecated("Use getPackage", "2.11.0") def getRequiredPackage(fullname: String): ModuleSymbol = getPackage(newTermNameCached(fullname)) - def getPackageObject(fullname: String): ModuleSymbol = - (getPackage(newTermName(fullname)).info member nme.PACKAGE) match { + def getPackageObject(fullname: String): ModuleSymbol = getPackageObject(newTermName(fullname)) + def getPackageObject(fullname: TermName): ModuleSymbol = + (getPackage(fullname).info member nme.PACKAGE) match { case x: ModuleSymbol => x case _ => MissingRequirementError.notFound("package object " + fullname) } @@ -187,8 +188,8 @@ trait Mirrors extends api.Mirrors { def getPackageObjectIfDefined(fullname: String): Symbol = getPackageObjectIfDefined(newTermNameCached(fullname)) - def getPackageObjectIfDefined(fullname: Name): Symbol = - wrapMissing(getPackageObject(fullname.toTermName)) + def getPackageObjectIfDefined(fullname: TermName): Symbol = + wrapMissing(getPackageObject(fullname)) override def staticPackage(fullname: String): ModuleSymbol = ensurePackageSymbol(fullname.toString, getModuleOrClass(newTermNameCached(fullname)), allowModules = false) diff --git a/src/reflect/scala/reflect/internal/Names.scala b/src/reflect/scala/reflect/internal/Names.scala index 333651162e..cea9215ae2 100644 --- a/src/reflect/scala/reflect/internal/Names.scala +++ b/src/reflect/scala/reflect/internal/Names.scala @@ -10,22 +10,7 @@ import scala.io.Codec import java.security.MessageDigest import scala.language.implicitConversions -trait LowPriorityNames { - self: Names => - - implicit def nameToNameOps(name: Name): NameOps[Name] = new NameOps[Name](name) -} - -/** The class Names ... - * - * @author Martin Odersky - * @version 1.0, 05/02/2005 - */ -trait Names extends api.Names with LowPriorityNames { - implicit def promoteTermNamesAsNecessary(name: Name): TermName = name.toTermName - -// Operations ------------------------------------------------------------- - +trait Names extends api.Names { private final val HASH_SIZE = 0x8000 private final val HASH_MASK = 0x7FFF private final val NAME_SIZE = 0x20000 @@ -399,9 +384,13 @@ trait Names extends api.Names with LowPriorityNames { def debugString = { val s = decode ; if (isTypeName) s + "!" else s } } + implicit def AnyNameOps(name: Name): NameOps[Name] = new NameOps(name) implicit def TermNameOps(name: TermName): NameOps[TermName] = new NameOps(name) implicit def TypeNameOps(name: TypeName): NameOps[TypeName] = new NameOps(name) + /** FIXME: This is a good example of something which is pure "value class" but cannot + * reap the benefits because an (unused) $outer pointer so it is not single-field. + */ final class NameOps[T <: Name](name: T) { def stripSuffix(suffix: Name): T = if (name endsWith suffix) dropRight(suffix.length) else name def dropRight(n: Int): T = name.subName(0, name.length - n).asInstanceOf[T] diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index 7dd4a14a46..f7b4b87570 100644 --- a/src/reflect/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala @@ -18,8 +18,6 @@ trait StdNames { def encode(str: String): TermName = newTermNameCached(NameTransformer.encode(str)) - implicit def lowerTermNames(n: TermName): String = n.toString - /** Tensions: would like the keywords to be the very first names entered into the names * storage so their ids count from 0, which simplifies the parser. Switched to abstract * classes to avoid all the indirection which is generated with implementation-containing @@ -37,11 +35,7 @@ trait StdNames { kws = kws + result result } - def result: Set[TermName] = { - val result = kws - kws = null - result - } + def result: Set[TermName] = try kws finally kws = null } private final object compactify extends (String => String) { @@ -201,6 +195,8 @@ trait StdNames { } abstract class TypeNames extends Keywords with TypeNamesApi { + override type NameType = TypeName + protected implicit def createNameType(name: String): TypeName = newTypeNameCached(name) final val BYNAME_PARAM_CLASS_NAME: NameType = "<byname>" @@ -262,6 +258,8 @@ trait StdNames { } abstract class TermNames extends Keywords with TermNamesApi { + override type NameType = TermName + protected implicit def createNameType(name: String): TermName = newTermNameCached(name) /** Base strings from which synthetic names are derived. */ diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 7de53a7731..5af4c616ff 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -248,7 +248,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => final def newModuleAndClassSymbol(name: Name, pos: Position, flags0: FlagSet): (ModuleSymbol, ClassSymbol) = { val flags = flags0 | MODULE - val m = newModuleSymbol(name, pos, flags) + val m = newModuleSymbol(name.toTermName, pos, flags) val c = newModuleClass(name.toTypeName, pos, flags & ModuleToClassFlags) connectModuleToClass(m, c) (m, c) diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index 54d02f3371..556db08baa 100644 --- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala @@ -465,7 +465,7 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni staticSingletonInstance(classLoader, symbol.fullName) else if (outer == null) staticSingletonInstance(classToJava(symbol.moduleClass.asClass)) - else innerSingletonInstance(outer, symbol.name) + else innerSingletonInstance(outer, symbol.name.toString) } override def toString = s"module mirror for ${symbol.fullName} (bound to $outer)" } diff --git a/test/disabled/presentation/akka.flags b/test/disabled/presentation/akka.flags index 56d026a62d..9bf2878f62 100644 --- a/test/disabled/presentation/akka.flags +++ b/test/disabled/presentation/akka.flags @@ -12,7 +12,7 @@ # running partest from. Run it from the root scala checkout for these files to resolve correctly # (by default when running 'ant test', or 'test/partest'). Paths use Unix separators, the test # framework translates them to the platform dependent representation. -# -bootclasspath lib/scala-compiler.jar:lib/scala-library.jar:lib/fjbg.jar +# -bootclasspath lib/scala-compiler.jar:lib/scala-library.jar # the following line would test using the quick compiler -# -bootclasspath build/quick/classes/compiler:build/quick/classes/library:lib/fjbg.jar +# -bootclasspath build/quick/classes/compiler:build/quick/classes/library diff --git a/test/disabled/presentation/simple-tests.opts b/test/disabled/presentation/simple-tests.opts index 8529bbf1a0..d651316984 100644 --- a/test/disabled/presentation/simple-tests.opts +++ b/test/disabled/presentation/simple-tests.opts @@ -12,7 +12,7 @@ # running partest from. Run it from the root scala checkout for these files to resolve correctly # (by default when running 'ant test', or 'test/partest'). Paths use Unix separators, the test # framework translates them to the platform dependent representation. --bootclasspath lib/scala-compiler.jar:lib/scala-library.jar:lib/fjbg.jar +-bootclasspath lib/scala-compiler.jar:lib/scala-library.jar # the following line would test using the quick compiler -# -bootclasspath build/quick/classes/compiler:build/quick/classes/library:lib/fjbg.jar +# -bootclasspath build/quick/classes/compiler:build/quick/classes/library diff --git a/test/files/ant/imported.xml b/test/files/ant/imported.xml index 5a4dfc319b..182c80aadf 100644 --- a/test/files/ant/imported.xml +++ b/test/files/ant/imported.xml @@ -56,7 +56,6 @@ INITIALISATION <property name="scala.dir" value="${quick.dir}"/> <property name="scala-library.lib" value="${scala.dir}/classes/library/"/> <property name="scala-compiler.lib" value="${scala.dir}/classes/compiler/"/> - <property name="fjbg.lib" value="${project.dir}/lib/fjbg.jar"/> </target> <target name="pack.init" if="pack.binary"> @@ -67,7 +66,6 @@ INITIALISATION <property name="scala.dir" value="${pack.dir}"/> <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/> <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/> - <property name="fjbg.lib" value=""/> </target> <target name="latest.init" if="latest.binary"> @@ -78,7 +76,6 @@ INITIALISATION <property name="scala.dir" value="${latest.dir}"/> <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/> <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/> - <property name="fjbg.lib" value=""/> </target> <target name="installed.init" if="installed.binary"> @@ -89,7 +86,6 @@ INITIALISATION <property name="scala.dir" value="${installed.dir}"/> <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/> <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/> - <property name="fjbg.lib" value=""/> </target> <target name="init" depends="quick.init, pack.init, latest.init, installed.init"> @@ -98,7 +94,6 @@ INITIALISATION <path id="scala.classpath"> <pathelement location="${scala-library.lib}"/> <pathelement location="${scala-compiler.lib}"/> - <pathelement location="${fjbg.lib}"/> <!-- only present for 'quick' --> </path> <fail message="Scala library '${scala-library.lib}' or '${scala-compiler.lib}' is missing/broken"> diff --git a/test/files/run/t6745-2.scala b/test/files/run/t6745-2.scala new file mode 100644 index 0000000000..31ecd42bd1 --- /dev/null +++ b/test/files/run/t6745-2.scala @@ -0,0 +1,22 @@ +import scala.tools.nsc._ +import scala.tools.partest.CompilerTest +import scala.collection.{ mutable, immutable, generic } + +object Test extends CompilerTest { + import global._ + import rootMirror._ + import definitions._ + import global.analyzer.{Context, ImportInfo} + + override def code = """ +package context { +} + """ + + def check(source: String, unit: global.CompilationUnit) = { + val context: Context = global.analyzer.rootContext(unit) + val importInfo: ImportInfo = context.imports.head // Predef._ + val importedSym = importInfo.importedSymbol(nme.CONSTRUCTOR) + assert(importedSym == NoSymbol, importedSym) // was "constructor Predef" + } +} diff --git a/test/postreview.py b/test/postreview.py deleted file mode 100644 index 2e2518f7ee..0000000000 --- a/test/postreview.py +++ /dev/null @@ -1,2540 +0,0 @@ -#!/usr/bin/env python -import cookielib -import difflib -import getpass -import marshal -import mimetools -import ntpath -import os -import re -import socket -import stat -import subprocess -import sys -import tempfile -import urllib -import urllib2 -from optparse import OptionParser -from tempfile import mkstemp -from urlparse import urljoin, urlparse - -try: - from hashlib import md5 -except ImportError: - # Support Python versions before 2.5. - from md5 import md5 - -try: - import json -except ImportError: - import simplejson as json - -# This specific import is necessary to handle the paths for -# cygwin enabled machines. -if (sys.platform.startswith('win') - or sys.platform.startswith('cygwin')): - import ntpath as cpath -else: - import posixpath as cpath - -### -# Default configuration -- user-settable variables follow. -### - -# The following settings usually aren't needed, but if your Review -# Board crew has specific preferences and doesn't want to express -# them with command line switches, set them here and you're done. -# In particular, setting the REVIEWBOARD_URL variable will allow -# you to make it easy for people to submit reviews regardless of -# their SCM setup. -# -# Note that in order for this script to work with a reviewboard site -# that uses local paths to access a repository, the 'Mirror path' -# in the repository setup page must be set to the remote URL of the -# repository. - -# -# Reviewboard URL. -# -# Set this if you wish to hard-code a default server to always use. -# It's generally recommended to set this using your SCM repository -# (for those that support it -- currently only SVN, Git, and Perforce). -# -# For example, on SVN: -# $ svn propset reviewboard:url http://reviewboard.example.com . -# -# Or with Git: -# $ git config reviewboard.url http://reviewboard.example.com -# -# On Perforce servers version 2008.1 and above: -# $ p4 counter reviewboard.url http://reviewboard.example.com -# -# Older Perforce servers only allow numerical counters, so embedding -# the url in the counter name is also supported: -# $ p4 counter reviewboard.url.http:\|\|reviewboard.example.com 1 -# -# Note that slashes are not allowed in Perforce counter names, so replace them -# with pipe characters (they are a safe substitute as they are not used -# unencoded in URLs). You may need to escape them when issuing the p4 counter -# command as above. -# -# If this is not possible or desired, setting the value here will let -# you get started quickly. -# -# For all other repositories, a .reviewboardrc file present at the top of -# the checkout will also work. For example: -# -# $ cat .reviewboardrc -# REVIEWBOARD_URL = "http://reviewboard.example.com" -# -REVIEWBOARD_URL = None - -# Default submission arguments. These are all optional; run this -# script with --help for descriptions of each argument. -TARGET_GROUPS = None -TARGET_PEOPLE = None -SUBMIT_AS = None -PUBLISH = False -OPEN_BROWSER = False - -# Debugging. For development... -DEBUG = False - -### -# End user-settable variables. -### - - -VERSION = "0.8" - -user_config = None -tempfiles = [] -options = None - - -class APIError(Exception): - pass - - -class RepositoryInfo: - """ - A representation of a source code repository. - """ - def __init__(self, path=None, base_path=None, supports_changesets=False, - supports_parent_diffs=False): - self.path = path - self.base_path = base_path - self.supports_changesets = supports_changesets - self.supports_parent_diffs = supports_parent_diffs - debug("repository info: %s" % self) - - def __str__(self): - return "Path: %s, Base path: %s, Supports changesets: %s" % \ - (self.path, self.base_path, self.supports_changesets) - - def set_base_path(self, base_path): - if not base_path.startswith('/'): - base_path = '/' + base_path - debug("changing repository info base_path from %s to %s" % \ - (self.base_path, base_path)) - self.base_path = base_path - - def find_server_repository_info(self, server): - """ - Try to find the repository from the list of repositories on the server. - For Subversion, this could be a repository with a different URL. For - all other clients, this is a noop. - """ - return self - - -class SvnRepositoryInfo(RepositoryInfo): - """ - A representation of a SVN source code repository. This version knows how to - find a matching repository on the server even if the URLs differ. - """ - def __init__(self, path, base_path, uuid, supports_parent_diffs=False): - RepositoryInfo.__init__(self, path, base_path, - supports_parent_diffs=supports_parent_diffs) - self.uuid = uuid - - def find_server_repository_info(self, server): - """ - The point of this function is to find a repository on the server that - matches self, even if the paths aren't the same. (For example, if self - uses an 'http' path, but the server uses a 'file' path for the same - repository.) It does this by comparing repository UUIDs. If the - repositories use the same path, you'll get back self, otherwise you'll - get a different SvnRepositoryInfo object (with a different path). - """ - repositories = server.get_repositories() - - for repository in repositories: - if repository['tool'] != 'Subversion': - continue - - info = self._get_repository_info(server, repository) - - if not info or self.uuid != info['uuid']: - continue - - repos_base_path = info['url'][len(info['root_url']):] - relpath = self._get_relative_path(self.base_path, repos_base_path) - if relpath: - return SvnRepositoryInfo(info['url'], relpath, self.uuid) - - # We didn't find a matching repository on the server. We'll just return - # self and hope for the best. - return self - - def _get_repository_info(self, server, repository): - try: - return server.get_repository_info(repository['id']) - except APIError, e: - # If the server couldn't fetch the repository info, it will return - # code 210. Ignore those. - # Other more serious errors should still be raised, though. - rsp = e.args[0] - if rsp['err']['code'] == 210: - return None - - raise e - - def _get_relative_path(self, path, root): - pathdirs = self._split_on_slash(path) - rootdirs = self._split_on_slash(root) - - # root is empty, so anything relative to that is itself - if len(rootdirs) == 0: - return path - - # If one of the directories doesn't match, then path is not relative - # to root. - if rootdirs != pathdirs: - return None - - # All the directories matched, so the relative path is whatever - # directories are left over. The base_path can't be empty, though, so - # if the paths are the same, return '/' - if len(pathdirs) == len(rootdirs): - return '/' - else: - return '/'.join(pathdirs[len(rootdirs):]) - - def _split_on_slash(self, path): - # Split on slashes, but ignore multiple slashes and throw away any - # trailing slashes. - split = re.split('/*', path) - if split[-1] == '': - split = split[0:-1] - return split - - -class ReviewBoardHTTPPasswordMgr(urllib2.HTTPPasswordMgr): - """ - Adds HTTP authentication support for URLs. - - Python 2.4's password manager has a bug in http authentication when the - target server uses a non-standard port. This works around that bug on - Python 2.4 installs. This also allows post-review to prompt for passwords - in a consistent way. - - See: http://bugs.python.org/issue974757 - """ - def __init__(self, reviewboard_url): - self.passwd = {} - self.rb_url = reviewboard_url - self.rb_user = None - self.rb_pass = None - - def find_user_password(self, realm, uri): - if uri.startswith(self.rb_url): - if self.rb_user is None or self.rb_pass is None: - print "==> HTTP Authentication Required" - print 'Enter username and password for "%s" at %s' % \ - (realm, urlparse(uri)[1]) - self.rb_user = raw_input('Username: ') - self.rb_pass = getpass.getpass('Password: ') - - return self.rb_user, self.rb_pass - else: - # If this is an auth request for some other domain (since HTTP - # handlers are global), fall back to standard password management. - return urllib2.HTTPPasswordMgr.find_user_password(self, realm, uri) - - -class ReviewBoardServer(object): - """ - An instance of a Review Board server. - """ - def __init__(self, url, info, cookie_file): - self.url = url - if self.url[-1] != '/': - self.url += '/' - self._info = info - self._server_info = None - self.cookie_file = cookie_file - self.cookie_jar = cookielib.MozillaCookieJar(self.cookie_file) - - # Set up the HTTP libraries to support all of the features we need. - cookie_handler = urllib2.HTTPCookieProcessor(self.cookie_jar) - password_mgr = ReviewBoardHTTPPasswordMgr(self.url) - auth_handler = urllib2.HTTPBasicAuthHandler(password_mgr) - - opener = urllib2.build_opener(cookie_handler, auth_handler) - opener.addheaders = [('User-agent', 'post-review/' + VERSION)] - urllib2.install_opener(opener) - - def login(self, force=False): - """ - Logs in to a Review Board server, prompting the user for login - information if needed. - """ - if not force and self.has_valid_cookie(): - return - - print "==> Review Board Login Required" - print "Enter username and password for Review Board at %s" % self.url - if options.username: - username = options.username - elif options.submit_as: - username = options.submit_as - else: - username = raw_input('Username: ') - - if not options.password: - password = getpass.getpass('Password: ') - else: - password = options.password - - debug('Logging in with username "%s"' % username) - try: - self.api_post('api/json/accounts/login/', { - 'username': username, - 'password': password, - }) - except APIError, e: - rsp, = e.args - - die("Unable to log in: %s (%s)" % (rsp["err"]["msg"], - rsp["err"]["code"])) - - debug("Logged in.") - - def has_valid_cookie(self): - """ - Load the user's cookie file and see if they have a valid - 'rbsessionid' cookie for the current Review Board server. Returns - true if so and false otherwise. - """ - try: - parsed_url = urlparse(self.url) - host = parsed_url[1] - path = parsed_url[2] or '/' - - # Cookie files don't store port numbers, unfortunately, so - # get rid of the port number if it's present. - host = host.split(":")[0] - - debug("Looking for '%s %s' cookie in %s" % \ - (host, path, self.cookie_file)) - self.cookie_jar.load(self.cookie_file, ignore_expires=True) - - try: - cookie = self.cookie_jar._cookies[host][path]['rbsessionid'] - - if not cookie.is_expired(): - debug("Loaded valid cookie -- no login required") - return True - - debug("Cookie file loaded, but cookie has expired") - except KeyError: - debug("Cookie file loaded, but no cookie for this server") - except IOError, error: - debug("Couldn't load cookie file: %s" % error) - - return False - - def new_review_request(self, changenum, submit_as=None): - """ - Creates a review request on a Review Board server, updating an - existing one if the changeset number already exists. - - If submit_as is provided, the specified user name will be recorded as - the submitter of the review request (given that the logged in user has - the appropriate permissions). - """ - try: - debug("Attempting to create review request for %s" % changenum) - data = { 'repository_path': self.info.path } - - if changenum: - data['changenum'] = changenum - - if submit_as: - debug("Submitting the review request as %s" % submit_as) - data['submit_as'] = submit_as - - rsp = self.api_post('api/json/reviewrequests/new/', data) - except APIError, e: - rsp, = e.args - - if not options.diff_only: - if rsp['err']['code'] == 204: # Change number in use - debug("Review request already exists. Updating it...") - rsp = self.api_post( - 'api/json/reviewrequests/%s/update_from_changenum/' % - rsp['review_request']['id']) - else: - raise e - - debug("Review request created") - return rsp['review_request'] - - def set_review_request_field(self, review_request, field, value): - """ - Sets a field in a review request to the specified value. - """ - rid = review_request['id'] - - debug("Attempting to set field '%s' to '%s' for review request '%s'" % - (field, value, rid)) - - self.api_post('api/json/reviewrequests/%s/draft/set/' % rid, { - field: value, - }) - - def get_review_request(self, rid): - """ - Returns the review request with the specified ID. - """ - rsp = self.api_get('api/json/reviewrequests/%s/' % rid) - return rsp['review_request'] - - def get_repositories(self): - """ - Returns the list of repositories on this server. - """ - rsp = self.api_get('/api/json/repositories/') - return rsp['repositories'] - - def get_repository_info(self, rid): - """ - Returns detailed information about a specific repository. - """ - rsp = self.api_get('/api/json/repositories/%s/info/' % rid) - return rsp['info'] - - def save_draft(self, review_request): - """ - Saves a draft of a review request. - """ - self.api_post("api/json/reviewrequests/%s/draft/save/" % - review_request['id']) - debug("Review request draft saved") - - def upload_diff(self, review_request, diff_content, parent_diff_content): - """ - Uploads a diff to a Review Board server. - """ - debug("Uploading diff, size: %d" % len(diff_content)) - - if parent_diff_content: - debug("Uploading parent diff, size: %d" % len(parent_diff_content)) - - fields = {} - files = {} - - if self.info.base_path: - fields['basedir'] = self.info.base_path - - files['path'] = { - 'filename': 'diff', - 'content': diff_content - } - - if parent_diff_content: - files['parent_diff_path'] = { - 'filename': 'parent_diff', - 'content': parent_diff_content - } - - self.api_post('api/json/reviewrequests/%s/diff/new/' % - review_request['id'], fields, files) - - def publish(self, review_request): - """ - Publishes a review request. - """ - debug("Publishing") - self.api_post('api/json/reviewrequests/%s/publish/' % - review_request['id']) - - def _get_server_info(self): - if not self._server_info: - self._server_info = self._info.find_server_repository_info(self) - - return self._server_info - - info = property(_get_server_info) - - def process_json(self, data): - """ - Loads in a JSON file and returns the data if successful. On failure, - APIError is raised. - """ - rsp = json.loads(data) - - if rsp['stat'] == 'fail': - raise APIError, rsp - - return rsp - - def http_get(self, path): - """ - Performs an HTTP GET on the specified path, storing any cookies that - were set. - """ - debug('HTTP GETting %s' % path) - - url = self._make_url(path) - - try: - rsp = urllib2.urlopen(url).read() - self.cookie_jar.save(self.cookie_file) - return rsp - except urllib2.HTTPError, e: - print "Unable to access %s (%s). The host path may be invalid" % \ - (url, e.code) - try: - debug(e.read()) - except AttributeError: - pass - die() - - def _make_url(self, path): - """Given a path on the server returns a full http:// style url""" - app = urlparse(self.url)[2] - if path[0] == '/': - url = urljoin(self.url, app[:-1] + path) - else: - url = urljoin(self.url, app + path) - - if not url.startswith('http'): - url = 'http://%s' % url - return url - - def api_get(self, path): - """ - Performs an API call using HTTP GET at the specified path. - """ - return self.process_json(self.http_get(path)) - - def http_post(self, path, fields, files=None): - """ - Performs an HTTP POST on the specified path, storing any cookies that - were set. - """ - if fields: - debug_fields = fields.copy() - else: - debug_fields = {} - - if 'password' in debug_fields: - debug_fields["password"] = "**************" - url = self._make_url(path) - debug('HTTP POSTing to %s: %s' % (url, debug_fields)) - - content_type, body = self._encode_multipart_formdata(fields, files) - headers = { - 'Content-Type': content_type, - 'Content-Length': str(len(body)) - } - - try: - r = urllib2.Request(url, body, headers) - data = urllib2.urlopen(r).read() - self.cookie_jar.save(self.cookie_file) - return data - except urllib2.URLError, e: - try: - debug(e.read()) - except AttributeError: - pass - - die("Unable to access %s. The host path may be invalid\n%s" % \ - (url, e)) - except urllib2.HTTPError, e: - die("Unable to access %s (%s). The host path may be invalid\n%s" % \ - (url, e.code, e.read())) - - def api_post(self, path, fields=None, files=None): - """ - Performs an API call using HTTP POST at the specified path. - """ - return self.process_json(self.http_post(path, fields, files)) - - def _encode_multipart_formdata(self, fields, files): - """ - Encodes data for use in an HTTP POST. - """ - BOUNDARY = mimetools.choose_boundary() - content = "" - - fields = fields or {} - files = files or {} - - for key in fields: - content += "--" + BOUNDARY + "\r\n" - content += "Content-Disposition: form-data; name=\"%s\"\r\n" % key - content += "\r\n" - content += fields[key] + "\r\n" - - for key in files: - filename = files[key]['filename'] - value = files[key]['content'] - content += "--" + BOUNDARY + "\r\n" - content += "Content-Disposition: form-data; name=\"%s\"; " % key - content += "filename=\"%s\"\r\n" % filename - content += "\r\n" - content += value + "\r\n" - - content += "--" + BOUNDARY + "--\r\n" - content += "\r\n" - - content_type = "multipart/form-data; boundary=%s" % BOUNDARY - - return content_type, content - - -class SCMClient(object): - """ - A base representation of an SCM tool for fetching repository information - and generating diffs. - """ - def get_repository_info(self): - return None - - def scan_for_server(self, repository_info): - """ - Scans the current directory on up to find a .reviewboard file - containing the server path. - """ - server_url = self._get_server_from_config(user_config, repository_info) - if server_url: - return server_url - - for path in walk_parents(os.getcwd()): - filename = os.path.join(path, ".reviewboardrc") - if os.path.exists(filename): - config = load_config_file(filename) - server_url = self._get_server_from_config(config, - repository_info) - if server_url: - return server_url - - return None - - def diff(self, args): - """ - Returns the generated diff and optional parent diff for this - repository. - - The returned tuple is (diff_string, parent_diff_string) - """ - return (None, None) - - def diff_between_revisions(self, revision_range, args, repository_info): - """ - Returns the generated diff between revisions in the repository. - """ - return None - - def _get_server_from_config(self, config, repository_info): - if 'REVIEWBOARD_URL' in config: - return config['REVIEWBOARD_URL'] - elif 'TREES' in config: - trees = config['TREES'] - if not isinstance(trees, dict): - die("Warning: 'TREES' in config file is not a dict!") - - if repository_info.path in trees and \ - 'REVIEWBOARD_URL' in trees[repository_info.path]: - return trees[repository_info.path]['REVIEWBOARD_URL'] - - return None - - -class CVSClient(SCMClient): - """ - A wrapper around the cvs tool that fetches repository - information and generates compatible diffs. - """ - def get_repository_info(self): - if not check_install("cvs"): - return None - - cvsroot_path = os.path.join("CVS", "Root") - - if not os.path.exists(cvsroot_path): - return None - - fp = open(cvsroot_path, "r") - repository_path = fp.read().strip() - fp.close() - - i = repository_path.find("@") - if i != -1: - repository_path = repository_path[i + 1:] - - i = repository_path.find(":") - if i != -1: - host = repository_path[:i] - try: - canon = socket.getfqdn(host) - repository_path = repository_path.replace('%s:' % host, - '%s:' % canon) - except socket.error, msg: - debug("failed to get fqdn for %s, msg=%s" % (host, msg)) - - return RepositoryInfo(path=repository_path) - - def diff(self, files): - """ - Performs a diff across all modified files in a CVS repository. - - CVS repositories do not support branches of branches in a way that - makes parent diffs possible, so we never return a parent diff - (the second value in the tuple). - """ - return (self.do_diff(files), None) - - def diff_between_revisions(self, revision_range, args, repository_info): - """ - Performs a diff between 2 revisions of a CVS repository. - """ - revs = [] - - for rev in revision_range.split(":"): - revs += ["-r", rev] - - return self.do_diff(revs) - - def do_diff(self, params): - """ - Performs the actual diff operation through cvs diff, handling - fake errors generated by CVS. - """ - # Diff returns "1" if differences were found. - return execute(["cvs", "diff", "-uN"] + params, - extra_ignore_errors=(1,)) - - -class ClearCaseClient(SCMClient): - """ - A wrapper around the clearcase tool that fetches repository - information and generates compatible diffs. - This client assumes that cygwin is installed on windows. - """ - ccroot_path = "/view/reviewboard.diffview/vobs/" - viewinfo = "" - viewtype = "snapshot" - - def get_filename_hash(self, fname): - # Hash the filename string so its easy to find the file later on. - return md5(fname).hexdigest() - - def get_repository_info(self): - if not check_install('cleartool help'): - return None - - # We must be running this from inside a view. - # Otherwise it doesn't make sense. - self.viewinfo = execute(["cleartool", "pwv", "-short"]) - if self.viewinfo.startswith('\*\* NONE'): - return None - - # Returning the hardcoded clearcase root path to match the server - # respository path. - # There is no reason to have a dynamic path unless you have - # multiple clearcase repositories. This should be implemented. - return RepositoryInfo(path=self.ccroot_path, - base_path=self.ccroot_path, - supports_parent_diffs=False) - - def get_previous_version(self, files): - file = [] - curdir = os.getcwd() - - # Cygwin case must transform a linux-like path to windows like path - # including drive letter. - if 'cygdrive' in curdir: - where = curdir.index('cygdrive') + 9 - drive_letter = curdir[where:where+1] - curdir = drive_letter + ":\\" + curdir[where+2:len(curdir)] - - for key in files: - # Sometimes there is a quote in the filename. It must be removed. - key = key.replace('\'', '') - elem_path = cpath.normpath(os.path.join(curdir, key)) - - # Removing anything before the last /vobs - # because it may be repeated. - elem_path_idx = elem_path.rfind("/vobs") - if elem_path_idx != -1: - elem_path = elem_path[elem_path_idx:len(elem_path)].strip("\"") - - # Call cleartool to get this version and the previous version - # of the element. - curr_version, pre_version = execute( - ["cleartool", "desc", "-pre", elem_path]) - curr_version = cpath.normpath(curr_version) - pre_version = pre_version.split(':')[1].strip() - - # If a specific version was given, remove it from the path - # to avoid version duplication - if "@@" in elem_path: - elem_path = elem_path[:elem_path.rfind("@@")] - file.append(elem_path + "@@" + pre_version) - file.append(curr_version) - - # Determnine if the view type is snapshot or dynamic. - if os.path.exists(file[0]): - self.viewtype = "dynamic" - - return file - - def get_extended_namespace(self, files): - """ - Parses the file path to get the extended namespace - """ - versions = self.get_previous_version(files) - - evfiles = [] - hlist = [] - - for vkey in versions: - # Verify if it is a checkedout file. - if "CHECKEDOUT" in vkey: - # For checkedout files just add it to the file list - # since it cannot be accessed outside the view. - splversions = vkey[:vkey.rfind("@@")] - evfiles.append(splversions) - else: - # For checkedin files. - ext_path = [] - ver = [] - fname = "" # fname holds the file name without the version. - (bpath, fpath) = cpath.splitdrive(vkey) - if bpath : - # Windows. - # The version (if specified like file.c@@/main/1) - # should be kept as a single string - # so split the path and concat the file name - # and version in the last position of the list. - ver = fpath.split("@@") - splversions = fpath[:vkey.rfind("@@")].split("\\") - fname = splversions.pop() - splversions.append(fname + ver[1]) - else : - # Linux. - bpath = vkey[:vkey.rfind("vobs")+4] - fpath = vkey[vkey.rfind("vobs")+5:] - ver = fpath.split("@@") - splversions = ver[0][:vkey.rfind("@@")].split("/") - fname = splversions.pop() - splversions.append(fname + ver[1]) - - filename = splversions.pop() - bpath = cpath.normpath(bpath + "/") - elem_path = bpath - - for key in splversions: - # For each element (directory) in the path, - # get its version from clearcase. - elem_path = cpath.join(elem_path, key) - - # This is the version to be appended to the extended - # path list. - this_version = execute( - ["cleartool", "desc", "-fmt", "%Vn", - cpath.normpath(elem_path)]) - if this_version: - ext_path.append(key + "/@@" + this_version + "/") - else: - ext_path.append(key + "/") - - # This must be done in case we haven't specified - # the version on the command line. - ext_path.append(cpath.normpath(fname + "/@@" + - vkey[vkey.rfind("@@")+2:len(vkey)])) - epstr = cpath.join(bpath, cpath.normpath(''.join(ext_path))) - evfiles.append(epstr) - - """ - In windows, there is a problem with long names(> 254). - In this case, we hash the string and copy the unextended - filename to a temp file whose name is the hash. - This way we can get the file later on for diff. - The same problem applies to snapshot views where the - extended name isn't available. - The previous file must be copied from the CC server - to a local dir. - """ - if cpath.exists(epstr) : - pass - else: - if len(epstr) > 254 or self.viewtype == "snapshot": - name = self.get_filename_hash(epstr) - # Check if this hash is already in the list - try: - i = hlist.index(name) - die("ERROR: duplicate value %s : %s" % - (name, epstr)) - except ValueError: - hlist.append(name) - - normkey = cpath.normpath(vkey) - td = tempfile.gettempdir() - # Cygwin case must transform a linux-like path to - # windows like path including drive letter - if 'cygdrive' in td: - where = td.index('cygdrive') + 9 - drive_letter = td[where:where+1] + ":" - td = cpath.join(drive_letter, td[where+1:]) - tf = cpath.normpath(cpath.join(td, name)) - if cpath.exists(tf): - debug("WARNING: FILE EXISTS") - os.unlink(tf) - execute(["cleartool", "get", "-to", tf, normkey]) - else: - die("ERROR: FILE NOT FOUND : %s" % epstr) - - return evfiles - - def get_files_from_label(self, label): - voblist=[] - # Get the list of vobs for the current view - allvoblist = execute(["cleartool", "lsvob", "-short"]).split() - # For each vob, find if the label is present - for vob in allvoblist: - try: - execute(["cleartool", "describe", "-local", - "lbtype:%s@%s" % (label, vob)]).split() - voblist.append(vob) - except: - pass - - filelist=[] - # For each vob containing the label, get the file list - for vob in voblist: - try: - res = execute(["cleartool", "find", vob, "-all", "-version", - "lbtype(%s)" % label, "-print"]) - filelist.extend(res.split()) - except : - pass - - # Return only the unique itens - return set(filelist) - - def diff(self, files): - """ - Performs a diff of the specified file and its previous version. - """ - # We must be running this from inside a view. - # Otherwise it doesn't make sense. - return self.do_diff(self.get_extended_namespace(files)) - - def diff_label(self, label): - """ - Get the files that are attached to a label and diff them - TODO - """ - return self.diff(self.get_files_from_label(label)) - - def diff_between_revisions(self, revision_range, args, repository_info): - """ - Performs a diff between 2 revisions of a CC repository. - """ - rev_str = '' - - for rev in revision_range.split(":"): - rev_str += "-r %s " % rev - - return self.do_diff(rev_str) - - def do_diff(self, params): - # Diff returns "1" if differences were found. - # Add the view name and view type to the description - if options.description: - options.description = ("VIEW: " + self.viewinfo + - "VIEWTYPE: " + self.viewtype + "\n" + options.description) - else: - options.description = (self.viewinfo + - "VIEWTYPE: " + self.viewtype + "\n") - - o = [] - Feol = False - while len(params) > 0: - # Read both original and modified files. - onam = params.pop(0) - mnam = params.pop(0) - file_data = [] - do_rem = False - # If the filename length is greater than 254 char for windows, - # we copied the file to a temp file - # because the open will not work for path greater than 254. - # This is valid for the original and - # modified files if the name size is > 254. - for filenam in (onam, mnam) : - if cpath.exists(filenam) and self.viewtype == "dynamic": - do_rem = False - fn = filenam - elif len(filenam) > 254 or self.viewtype == "snapshot": - fn = self.get_filename_hash(filenam) - fn = cpath.join(tempfile.gettempdir(), fn) - do_rem = True - fd = open(cpath.normpath(fn)) - fdata = fd.readlines() - fd.close() - file_data.append(fdata) - # If the file was temp, it should be removed. - if do_rem: - os.remove(filenam) - - modi = file_data.pop() - orig = file_data.pop() - - # For snapshot views, the local directories must be removed because - # they will break the diff on the server. Just replacing - # everything before the view name (including the view name) for - # vobs do the work. - if (self.viewtype == "snapshot" - and (sys.platform.startswith('win') - or sys.platform.startswith('cygwin'))): - vinfo = self.viewinfo.rstrip("\r\n") - mnam = "c:\\\\vobs" + mnam[mnam.rfind(vinfo) + len(vinfo):] - onam = "c:\\\\vobs" + onam[onam.rfind(vinfo) + len(vinfo):] - # Call the diff lib to generate a diff. - # The dates are bogus, since they don't natter anyway. - # The only thing is that two spaces are needed to the server - # so it can identify the heades correctly. - diff = difflib.unified_diff(orig, modi, onam, mnam, - ' 2002-02-21 23:30:39.942229878 -0800', - ' 2002-02-21 23:30:50.442260588 -0800', lineterm=' \n') - # Transform the generator output into a string output - # Use a comprehension instead of a generator, - # so 2.3.x doesn't fail to interpret. - diffstr = ''.join([str(l) for l in diff]) - # Workaround for the difflib no new line at end of file - # problem. - if not diffstr.endswith('\n'): - diffstr = diffstr + ("\n\\ No newline at end of file\n") - o.append(diffstr) - - ostr = ''.join(o) - return (ostr, None) # diff, parent_diff (not supported) - - -class SVNClient(SCMClient): - """ - A wrapper around the svn Subversion tool that fetches repository - information and generates compatible diffs. - """ - def get_repository_info(self): - if not check_install('svn help'): - return None - - # Get the SVN repository path (either via a working copy or - # a supplied URI) - svn_info_params = ["svn", "info"] - if options.repository_url: - svn_info_params.append(options.repository_url) - data = execute(svn_info_params, - ignore_errors=True) - m = re.search(r'^Repository Root: (.+)$', data, re.M) - if not m: - return None - - path = m.group(1) - - m = re.search(r'^URL: (.+)$', data, re.M) - if not m: - return None - - base_path = m.group(1)[len(path):] or "/" - - m = re.search(r'^Repository UUID: (.+)$', data, re.M) - if not m: - return None - - return SvnRepositoryInfo(path, base_path, m.group(1)) - - def scan_for_server(self, repository_info): - # Scan first for dot files, since it's faster and will cover the - # user's $HOME/.reviewboardrc - server_url = super(SVNClient, self).scan_for_server(repository_info) - if server_url: - return server_url - - return self.scan_for_server_property(repository_info) - - def scan_for_server_property(self, repository_info): - def get_url_prop(path): - url = execute(["svn", "propget", "reviewboard:url", path]).strip() - return url or None - - for path in walk_parents(os.getcwd()): - if not os.path.exists(os.path.join(path, ".svn")): - break - - prop = get_url_prop(path) - if prop: - return prop - - return get_url_prop(repository_info.path) - - def diff(self, files): - """ - Performs a diff across all modified files in a Subversion repository. - - SVN repositories do not support branches of branches in a way that - makes parent diffs possible, so we never return a parent diff - (the second value in the tuple). - """ - return (self.do_diff(["svn", "diff", "--diff-cmd=diff"] + files), - None) - - def diff_between_revisions(self, revision_range, args, repository_info): - """ - Performs a diff between 2 revisions of a Subversion repository. - """ - if options.repository_url: - revisions = revision_range.split(':') - if len(revisions) < 1: - return None - elif len(revisions) == 1: - revisions.append('HEAD') - - # if a new path was supplied at the command line, set it - if len(args): - repository_info.set_base_path(args[0]) - - url = repository_info.path + repository_info.base_path - - old_url = url + '@' + revisions[0] - new_url = url + '@' + revisions[1] - - return self.do_diff(["svn", "diff", "--diff-cmd=diff", old_url, - new_url], - repository_info) - # Otherwise, perform the revision range diff using a working copy - else: - return self.do_diff(["svn", "diff", "--diff-cmd=diff", "-r", - revision_range], - repository_info) - - def do_diff(self, cmd, repository_info=None): - """ - Performs the actual diff operation, handling renames and converting - paths to absolute. - """ - diff = execute(cmd, split_lines=True) - diff = self.handle_renames(diff) - diff = self.convert_to_absolute_paths(diff, repository_info) - - return ''.join(diff) - - def handle_renames(self, diff_content): - """ - The output of svn diff is incorrect when the file in question came - into being via svn mv/cp. Although the patch for these files are - relative to its parent, the diff header doesn't reflect this. - This function fixes the relevant section headers of the patch to - portray this relationship. - """ - - # svn diff against a repository URL on two revisions appears to - # handle moved files properly, so only adjust the diff file names - # if they were created using a working copy. - if options.repository_url: - return diff_content - - result = [] - - from_line = "" - for line in diff_content: - if line.startswith('--- '): - from_line = line - continue - - # This is where we decide how mangle the previous '--- ' - if line.startswith('+++ '): - to_file, _ = self.parse_filename_header(line[4:]) - info = self.svn_info(to_file) - if info.has_key("Copied From URL"): - url = info["Copied From URL"] - root = info["Repository Root"] - from_file = urllib.unquote(url[len(root):]) - result.append(from_line.replace(to_file, from_file)) - else: - result.append(from_line) #as is, no copy performed - - # We only mangle '---' lines. All others get added straight to - # the output. - result.append(line) - - return result - - - def convert_to_absolute_paths(self, diff_content, repository_info): - """ - Converts relative paths in a diff output to absolute paths. - This handles paths that have been svn switched to other parts of the - repository. - """ - - result = [] - - for line in diff_content: - front = None - if line.startswith('+++ ') or line.startswith('--- ') or line.startswith('Index: '): - front, line = line.split(" ", 1) - - if front: - if line.startswith('/'): #already absolute - line = front + " " + line - else: - # filename and rest of line (usually the revision - # component) - file, rest = self.parse_filename_header(line) - - # If working with a diff generated outside of a working - # copy, then file paths are already absolute, so just - # add initial slash. - if options.repository_url: - path = urllib.unquote( - "%s/%s" % (repository_info.base_path, file)) - else: - info = self.svn_info(file) - url = info["URL"] - root = info["Repository Root"] - path = urllib.unquote(url[len(root):]) - - line = front + " " + path + rest - - result.append(line) - - return result - - def svn_info(self, path): - """Return a dict which is the result of 'svn info' at a given path.""" - svninfo = {} - for info in execute(["svn", "info", path], - split_lines=True): - parts = info.strip().split(": ", 1) - if len(parts) == 2: - key, value = parts - svninfo[key] = value - - return svninfo - - # Adapted from server code parser.py - def parse_filename_header(self, s): - parts = None - if "\t" in s: - # There's a \t separating the filename and info. This is the - # best case scenario, since it allows for filenames with spaces - # without much work. - parts = s.split("\t") - - # There's spaces being used to separate the filename and info. - # This is technically wrong, so all we can do is assume that - # 1) the filename won't have multiple consecutive spaces, and - # 2) there's at least 2 spaces separating the filename and info. - if " " in s: - parts = re.split(r" +", s) - - if parts: - parts[1] = '\t' + parts[1] - return parts - - # strip off ending newline, and return it as the second component - return [s.split('\n')[0], '\n'] - - -class PerforceClient(SCMClient): - """ - A wrapper around the p4 Perforce tool that fetches repository information - and generates compatible diffs. - """ - def get_repository_info(self): - if not check_install('p4 help'): - return None - - data = execute(["p4", "info"], ignore_errors=True) - - m = re.search(r'^Server address: (.+)$', data, re.M) - if not m: - return None - - repository_path = m.group(1).strip() - - try: - hostname, port = repository_path.split(":") - info = socket.gethostbyaddr(hostname) - repository_path = "%s:%s" % (info[0], port) - except (socket.gaierror, socket.herror): - pass - - return RepositoryInfo(path=repository_path, supports_changesets=True) - - def scan_for_server(self, repository_info): - # Scan first for dot files, since it's faster and will cover the - # user's $HOME/.reviewboardrc - server_url = \ - super(PerforceClient, self).scan_for_server(repository_info) - - if server_url: - return server_url - - return self.scan_for_server_counter(repository_info) - - def scan_for_server_counter(self, repository_info): - """ - Checks the Perforce counters to see if the Review Board server's url - is specified. Since Perforce only started supporting non-numeric - counter values in server version 2008.1, we support both a normal - counter 'reviewboard.url' with a string value and embedding the url in - a counter name like 'reviewboard.url.http:||reviewboard.example.com'. - Note that forward slashes aren't allowed in counter names, so - pipe ('|') characters should be used. These should be safe because they - should not be used unencoded in urls. - """ - - counters_text = execute(["p4", "counters"]) - - # Try for a "reviewboard.url" counter first. - m = re.search(r'^reviewboard.url = (\S+)', counters_text, re.M) - - if m: - return m.group(1) - - # Next try for a counter of the form: - # reviewboard_url.http:||reviewboard.example.com - m2 = re.search(r'^reviewboard.url\.(\S+)', counters_text, re.M) - - if m2: - return m2.group(1).replace('|', '/') - - return None - - def get_changenum(self, args): - if len(args) == 1: - try: - return str(int(args[0])) - except ValueError: - pass - return None - - def diff(self, args): - """ - Goes through the hard work of generating a diff on Perforce in order - to take into account adds/deletes and to provide the necessary - revision information. - """ - # set the P4 enviroment: - if options.p4_client: - os.environ['P4CLIENT'] = options.p4_client - - if options.p4_port: - os.environ['P4PORT'] = options.p4_port - - changenum = self.get_changenum(args) - if changenum is None: - return self._path_diff(args) - else: - return self._changenum_diff(changenum) - - - def _path_diff(self, args): - """ - Process a path-style diff. See _changenum_diff for the alternate - version that handles specific change numbers. - - Multiple paths may be specified in `args`. The path styles supported - are: - - //path/to/file - Upload file as a "new" file. - - //path/to/dir/... - Upload all files as "new" files. - - //path/to/file[@#]rev - Upload file from that rev as a "new" file. - - //path/to/file[@#]rev,[@#]rev - Upload a diff between revs. - - //path/to/dir/...[@#]rev,[@#]rev - Upload a diff of all files between revs in that directory. - """ - r_revision_range = re.compile(r'^(?P<path>//[^@#]+)' + - r'(?P<revision1>[#@][^,]+)?' + - r'(?P<revision2>,[#@][^,]+)?$') - - empty_filename = make_tempfile() - tmp_diff_from_filename = make_tempfile() - tmp_diff_to_filename = make_tempfile() - - diff_lines = [] - - for path in args: - m = r_revision_range.match(path) - - if not m: - die('Path %r does not match a valid Perforce path.' % (path,)) - revision1 = m.group('revision1') - revision2 = m.group('revision2') - first_rev_path = m.group('path') - - if revision1: - first_rev_path += revision1 - records = self._run_p4(['files', first_rev_path]) - - # Make a map for convenience. - files = {} - - # Records are: - # 'rev': '1' - # 'func': '...' - # 'time': '1214418871' - # 'action': 'edit' - # 'type': 'ktext' - # 'depotFile': '...' - # 'change': '123456' - for record in records: - if record['action'] != 'delete': - if revision2: - files[record['depotFile']] = [record, None] - else: - files[record['depotFile']] = [None, record] - - if revision2: - # [1:] to skip the comma. - second_rev_path = m.group('path') + revision2[1:] - records = self._run_p4(['files', second_rev_path]) - for record in records: - if record['action'] != 'delete': - try: - m = files[record['depotFile']] - m[1] = record - except KeyError: - files[record['depotFile']] = [None, record] - - old_file = new_file = empty_filename - changetype_short = None - - for depot_path, (first_record, second_record) in files.items(): - old_file = new_file = empty_filename - if first_record is None: - self._write_file(depot_path + '#' + second_record['rev'], - tmp_diff_to_filename) - new_file = tmp_diff_to_filename - changetype_short = 'A' - base_revision = 0 - elif second_record is None: - self._write_file(depot_path + '#' + first_record['rev'], - tmp_diff_from_filename) - old_file = tmp_diff_from_filename - changetype_short = 'D' - base_revision = int(first_record['rev']) - else: - self._write_file(depot_path + '#' + first_record['rev'], - tmp_diff_from_filename) - self._write_file(depot_path + '#' + second_record['rev'], - tmp_diff_to_filename) - new_file = tmp_diff_to_filename - old_file = tmp_diff_from_filename - changetype_short = 'M' - base_revision = int(first_record['rev']) - - dl = self._do_diff(old_file, new_file, depot_path, - base_revision, changetype_short, - ignore_unmodified=True) - diff_lines += dl - - os.unlink(empty_filename) - os.unlink(tmp_diff_from_filename) - os.unlink(tmp_diff_to_filename) - return (''.join(diff_lines), None) - - def _run_p4(self, command): - """Execute a perforce command using the python marshal API. - - - command: A list of strings of the command to execute. - - The return type depends on the command being run. - """ - command = ['p4', '-G'] + command - p = subprocess.Popen(command, stdout=subprocess.PIPE) - result = [] - has_error = False - - while 1: - try: - data = marshal.load(p.stdout) - except EOFError: - break - else: - result.append(data) - if data.get('code', None) == 'error': - has_error = True - - rc = p.wait() - - if rc or has_error: - for record in result: - if 'data' in record: - print record['data'] - die('Failed to execute command: %s\n' % (command,)) - - return result - - def _changenum_diff(self, changenum): - """ - Process a diff for a particular change number. This handles both - pending and submitted changelists. - - See _path_diff for the alternate version that does diffs of depot - paths. - """ - # TODO: It might be a good idea to enhance PerforceDiffParser to - # understand that newFile could include a revision tag for post-submit - # reviewing. - cl_is_pending = False - - debug("Generating diff for changenum %s" % changenum) - - description = execute(["p4", "describe", "-s", changenum], - split_lines=True) - - if '*pending*' in description[0]: - cl_is_pending = True - - # Get the file list - for line_num, line in enumerate(description): - if 'Affected files ...' in line: - break - else: - # Got to the end of all the description lines and didn't find - # what we were looking for. - die("Couldn't find any affected files for this change.") - - description = description[line_num+2:] - - diff_lines = [] - - empty_filename = make_tempfile() - tmp_diff_from_filename = make_tempfile() - tmp_diff_to_filename = make_tempfile() - - for line in description: - line = line.strip() - if not line: - continue - - m = re.search(r'\.\.\. ([^#]+)#(\d+) (add|edit|delete|integrate|branch)', line) - if not m: - die("Unsupported line from p4 opened: %s" % line) - - depot_path = m.group(1) - base_revision = int(m.group(2)) - if not cl_is_pending: - # If the changelist is pending our base revision is the one that's - # currently in the depot. If we're not pending the base revision is - # actually the revision prior to this one - base_revision -= 1 - - changetype = m.group(3) - - debug('Processing %s of %s' % (changetype, depot_path)) - - old_file = new_file = empty_filename - old_depot_path = new_depot_path = None - changetype_short = None - - if changetype == 'edit' or changetype == 'integrate': - # A big assumption - new_revision = base_revision + 1 - - # We have an old file, get p4 to take this old version from the - # depot and put it into a plain old temp file for us - old_depot_path = "%s#%s" % (depot_path, base_revision) - self._write_file(old_depot_path, tmp_diff_from_filename) - old_file = tmp_diff_from_filename - - # Also print out the new file into a tmpfile - if cl_is_pending: - new_file = self._depot_to_local(depot_path) - else: - new_depot_path = "%s#%s" %(depot_path, new_revision) - self._write_file(new_depot_path, tmp_diff_to_filename) - new_file = tmp_diff_to_filename - - changetype_short = "M" - - elif changetype == 'add' or changetype == 'branch': - # We have a new file, get p4 to put this new file into a pretty - # temp file for us. No old file to worry about here. - if cl_is_pending: - new_file = self._depot_to_local(depot_path) - else: - self._write_file(depot_path, tmp_diff_to_filename) - new_file = tmp_diff_to_filename - changetype_short = "A" - - elif changetype == 'delete': - # We've deleted a file, get p4 to put the deleted file into a temp - # file for us. The new file remains the empty file. - old_depot_path = "%s#%s" % (depot_path, base_revision) - self._write_file(old_depot_path, tmp_diff_from_filename) - old_file = tmp_diff_from_filename - changetype_short = "D" - else: - die("Unknown change type '%s' for %s" % (changetype, depot_path)) - - dl = self._do_diff(old_file, new_file, depot_path, base_revision, changetype_short) - diff_lines += dl - - os.unlink(empty_filename) - os.unlink(tmp_diff_from_filename) - os.unlink(tmp_diff_to_filename) - return (''.join(diff_lines), None) - - def _do_diff(self, old_file, new_file, depot_path, base_revision, - changetype_short, ignore_unmodified=False): - """ - Do the work of producing a diff for Perforce. - - old_file - The absolute path to the "old" file. - new_file - The absolute path to the "new" file. - depot_path - The depot path in Perforce for this file. - base_revision - The base perforce revision number of the old file as - an integer. - changetype_short - The change type as a single character string. - ignore_unmodified - If True, will return an empty list if the file - is not changed. - - Returns a list of strings of diff lines. - """ - if hasattr(os, 'uname') and os.uname()[0] == 'SunOS': - diff_cmd = ["gdiff", "-urNp", old_file, new_file] - else: - diff_cmd = ["diff", "-urNp", old_file, new_file] - # Diff returns "1" if differences were found. - dl = execute(diff_cmd, extra_ignore_errors=(1,2), - translate_newlines=False) - - # If the input file has ^M characters at end of line, lets ignore them. - dl = dl.replace('\r\r\n', '\r\n') - dl = dl.splitlines(True) - - cwd = os.getcwd() - if depot_path.startswith(cwd): - local_path = depot_path[len(cwd) + 1:] - else: - local_path = depot_path - - # Special handling for the output of the diff tool on binary files: - # diff outputs "Files a and b differ" - # and the code below expects the output to start with - # "Binary files " - if len(dl) == 1 and \ - dl[0] == ('Files %s and %s differ'% (old_file, new_file)): - dl = ['Binary files %s and %s differ'% (old_file, new_file)] - - if dl == [] or dl[0].startswith("Binary files "): - if dl == []: - if ignore_unmodified: - return [] - else: - print "Warning: %s in your changeset is unmodified" % \ - local_path - - dl.insert(0, "==== %s#%s ==%s== %s ====\n" % \ - (depot_path, base_revision, changetype_short, local_path)) - dl.append('\n') - else: - m = re.search(r'(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)', dl[1]) - if m: - timestamp = m.group(1) - else: - # Thu Sep 3 11:24:48 2007 - m = re.search(r'(\w+)\s+(\w+)\s+(\d+)\s+(\d\d:\d\d:\d\d)\s+(\d\d\d\d)', dl[1]) - if not m: - die("Unable to parse diff header: %s" % dl[1]) - - month_map = { - "Jan": "01", - "Feb": "02", - "Mar": "03", - "Apr": "04", - "May": "05", - "Jun": "06", - "Jul": "07", - "Aug": "08", - "Sep": "09", - "Oct": "10", - "Nov": "11", - "Dec": "12", - } - month = month_map[m.group(2)] - day = m.group(3) - timestamp = m.group(4) - year = m.group(5) - - timestamp = "%s-%s-%s %s" % (year, month, day, timestamp) - - dl[0] = "--- %s\t%s#%s\n" % (local_path, depot_path, base_revision) - dl[1] = "+++ %s\t%s\n" % (local_path, timestamp) - - return dl - - def _write_file(self, depot_path, tmpfile): - """ - Grabs a file from Perforce and writes it to a temp file. p4 print sets - the file readonly and that causes a later call to unlink fail. So we - make the file read/write. - """ - debug('Writing "%s" to "%s"' % (depot_path, tmpfile)) - execute(["p4", "print", "-o", tmpfile, "-q", depot_path]) - os.chmod(tmpfile, stat.S_IREAD | stat.S_IWRITE) - - def _depot_to_local(self, depot_path): - """ - Given a path in the depot return the path on the local filesystem to - the same file. If there are multiple results, take only the last - result from the where command. - """ - where_output = self._run_p4(['where', depot_path]) - return where_output[-1]['path'] - - -class MercurialClient(SCMClient): - """ - A wrapper around the hg Mercurial tool that fetches repository - information and generates compatible diffs. - """ - def get_repository_info(self): - if not check_install('hg --help'): - return None - - data = execute(["hg", "root"], ignore_errors=True) - if data.startswith('abort:'): - # hg aborted => no mercurial repository here. - return None - - # Elsewhere, hg root output give us the repository path. - - # We save data here to use it as a fallback. See below - local_data = data.strip() - - svn = execute(["hg", "svn", "info", ], ignore_errors=True) - - if (not svn.startswith('abort:') and - not svn.startswith("hg: unknown command")): - self.type = 'svn' - m = re.search(r'^Repository Root: (.+)$', svn, re.M) - - if not m: - return None - - path = m.group(1) - m2 = re.match(r'^(svn\+ssh|http|https)://([-a-zA-Z0-9.]*@)(.*)$', - path) - if m2: - path = '%s://%s' % (m2.group(1), m2.group(3)) - - m = re.search(r'^URL: (.+)$', svn, re.M) - - if not m: - return None - - base_path = m.group(1)[len(path):] or "/" - return RepositoryInfo(path=path, - base_path=base_path, - supports_parent_diffs=True) - - self.type = 'hg' - - # We are going to search .hg/hgrc for the default path. - file_name = os.path.join(local_data,'.hg', 'hgrc') - - if not os.path.exists(file_name): - return RepositoryInfo(path=local_data, base_path='/', - supports_parent_diffs=True) - - f = open(file_name) - data = f.read() - f.close() - - m = re.search(r'^default\s+=\s+(.+)$', data, re.M) - - if not m: - # Return the local path, if no default value is found. - return RepositoryInfo(path=local_data, base_path='/', - supports_parent_diffs=True) - - path = m.group(1).strip() - - return RepositoryInfo(path=path, base_path='', - supports_parent_diffs=True) - - def diff(self, files): - """ - Performs a diff across all modified files in a Mercurial repository. - """ - # We don't support parent diffs with Mercurial yet, so we always - # return None for the parent diff. - if self.type == 'svn': - parent = execute(['hg', 'parent', '--svn', '--template', - '{node}\n']).strip() - - if options.parent_branch: - parent = options.parent_branch - - if options.guess_summary and not options.summary: - options.summary = execute(['hg', 'log', '-r.', '--template', - r'{desc|firstline}\n']) - - if options.guess_description and not options.description: - numrevs = len(execute(['hg', 'log', '-r.:%s' % parent, - '--follow', '--template', - r'{rev}\n']).strip().split('\n')) - options.description = execute(['hg', 'log', '-r.:%s' % parent, - '--follow', '--template', - r'{desc}\n\n', '--limit', - str(numrevs-1)]).strip() - - return (execute(["hg", "diff", "--svn", '-r%s:.' % parent]), None) - - return (execute(["hg", "diff"] + files), None) - - def diff_between_revisions(self, revision_range, args, repository_info): - """ - Performs a diff between 2 revisions of a Mercurial repository. - """ - if self.type != 'hg': - raise NotImplementedError - - r1, r2 = revision_range.split(':') - return execute(["hg", "diff", "-r", r1, "-r", r2]) - - -class GitClient(SCMClient): - """ - A wrapper around git that fetches repository information and generates - compatible diffs. This will attempt to generate a diff suitable for the - remote repository, whether git, SVN or Perforce. - """ - def get_repository_info(self): - if not check_install('git --help'): - return None - - git_dir = execute(["git", "rev-parse", "--git-dir"], - ignore_errors=True).strip() - - if git_dir.startswith("fatal:") or not os.path.isdir(git_dir): - return None - - # post-review in directories other than the top level of - # of a work-tree would result in broken diffs on the server - os.chdir(os.path.dirname(os.path.abspath(git_dir))) - - # We know we have something we can work with. Let's find out - # what it is. We'll try SVN first. - data = execute(["git", "svn", "info"], ignore_errors=True) - - m = re.search(r'^Repository Root: (.+)$', data, re.M) - if m: - path = m.group(1) - m = re.search(r'^URL: (.+)$', data, re.M) - - if m: - base_path = m.group(1)[len(path):] or "/" - m = re.search(r'^Repository UUID: (.+)$', data, re.M) - - if m: - uuid = m.group(1) - self.type = "svn" - - return SvnRepositoryInfo(path=path, base_path=base_path, - uuid=uuid, - supports_parent_diffs=True) - else: - # Versions of git-svn before 1.5.4 don't (appear to) support - # 'git svn info'. If we fail because of an older git install, - # here, figure out what version of git is installed and give - # the user a hint about what to do next. - version = execute(["git", "svn", "--version"], ignore_errors=True) - version_parts = re.search('version (\d+)\.(\d+)\.(\d+)', - version) - svn_remote = execute(["git", "config", "--get", - "svn-remote.svn.url"], ignore_errors=True) - - if (version_parts and - not self.is_valid_version((int(version_parts.group(1)), - int(version_parts.group(2)), - int(version_parts.group(3))), - (1, 5, 4)) and - svn_remote): - die("Your installation of git-svn must be upgraded to " + \ - "version 1.5.4 or later") - - # Okay, maybe Perforce. - # TODO - - # Nope, it's git then. - origin = execute(["git", "remote", "show", "origin"]) - m = re.search(r'URL: (.+)', origin) - if m: - url = m.group(1).rstrip('/') - if url: - self.type = "git" - return RepositoryInfo(path=url, base_path='', - supports_parent_diffs=True) - - return None - - def is_valid_version(self, actual, expected): - """ - Takes two tuples, both in the form: - (major_version, minor_version, micro_version) - Returns true if the actual version is greater than or equal to - the expected version, and false otherwise. - """ - return (actual[0] > expected[0]) or \ - (actual[0] == expected[0] and actual[1] > expected[1]) or \ - (actual[0] == expected[0] and actual[1] == expected[1] and \ - actual[2] >= expected[2]) - - def scan_for_server(self, repository_info): - # Scan first for dot files, since it's faster and will cover the - # user's $HOME/.reviewboardrc - server_url = super(GitClient, self).scan_for_server(repository_info) - - if server_url: - return server_url - - # TODO: Maybe support a server per remote later? Is that useful? - url = execute(["git", "config", "--get", "reviewboard.url"], - ignore_errors=True).strip() - if url: - return url - - if self.type == "svn": - # Try using the reviewboard:url property on the SVN repo, if it - # exists. - prop = SVNClient().scan_for_server_property(repository_info) - - if prop: - return prop - - return None - - def diff(self, args): - """ - Performs a diff across all modified files in the branch, taking into - account a parent branch. - """ - parent_branch = options.parent_branch or "master" - - diff_lines = self.make_diff(parent_branch) - - if parent_branch != "master": - parent_diff_lines = self.make_diff("master", parent_branch) - else: - parent_diff_lines = None - - if options.guess_summary and not options.summary: - options.summary = execute(["git", "log", "--pretty=format:%s", - "HEAD^.."], ignore_errors=True).strip() - - if options.guess_description and not options.description: - options.description = execute( - ["git", "log", "--pretty=format:%s%n%n%b", parent_branch + ".."], - ignore_errors=True).strip() - - return (diff_lines, parent_diff_lines) - - def make_diff(self, parent_branch, source_branch=""): - """ - Performs a diff on a particular branch range. - """ - if self.type == "svn": - diff_lines = execute(["git", "diff", "--no-color", "--no-prefix", - "-r", "-u", "%s..%s" % (parent_branch, - source_branch)], - split_lines=True) - return self.make_svn_diff(parent_branch, diff_lines) - elif self.type == "git": - return execute(["git", "diff", "--no-color", "--full-index", - parent_branch]) - - return None - - def make_svn_diff(self, parent_branch, diff_lines): - """ - Formats the output of git diff such that it's in a form that - svn diff would generate. This is needed so the SVNTool in Review - Board can properly parse this diff. - """ - rev = execute(["git", "svn", "find-rev", "master"]).strip() - - if not rev: - return None - - diff_data = "" - filename = "" - revision = "" - newfile = False - - for line in diff_lines: - if line.startswith("diff "): - # Grab the filename and then filter this out. - # This will be in the format of: - # - # diff --git a/path/to/file b/path/to/file - info = line.split(" ") - diff_data += "Index: %s\n" % info[2] - diff_data += "=" * 67 - diff_data += "\n" - elif line.startswith("index "): - # Filter this out. - pass - elif line.strip() == "--- /dev/null": - # New file - newfile = True - elif line.startswith("--- "): - newfile = False - diff_data += "--- %s\t(revision %s)\n" % \ - (line[4:].strip(), rev) - elif line.startswith("+++ "): - filename = line[4:].strip() - if newfile: - diff_data += "--- %s\t(revision 0)\n" % filename - diff_data += "+++ %s\t(revision 0)\n" % filename - else: - # We already printed the "--- " line. - diff_data += "+++ %s\t(working copy)\n" % filename - else: - diff_data += line - - return diff_data - - def diff_between_revisions(self, revision_range, args, repository_info): - pass - - -SCMCLIENTS = ( - SVNClient(), - CVSClient(), - GitClient(), - MercurialClient(), - PerforceClient(), - ClearCaseClient(), -) - -def debug(s): - """ - Prints debugging information if post-review was run with --debug - """ - if DEBUG or options and options.debug: - print ">>> %s" % s - - -def make_tempfile(): - """ - Creates a temporary file and returns the path. The path is stored - in an array for later cleanup. - """ - fd, tmpfile = mkstemp() - os.close(fd) - tempfiles.append(tmpfile) - return tmpfile - - -def check_install(command): - """ - Try executing an external command and return a boolean indicating whether - that command is installed or not. The 'command' argument should be - something that executes quickly, without hitting the network (for - instance, 'svn help' or 'git --version'). - """ - try: - p = subprocess.Popen(command.split(' '), - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - return True - except OSError: - return False - - -def execute(command, env=None, split_lines=False, ignore_errors=False, - extra_ignore_errors=(), translate_newlines=True): - """ - Utility function to execute a command and return the output. - """ - if isinstance(command, list): - debug(subprocess.list2cmdline(command)) - else: - debug(command) - - if env: - env.update(os.environ) - else: - env = os.environ.copy() - - env['LC_ALL'] = 'en_US.UTF-8' - env['LANGUAGE'] = 'en_US.UTF-8' - - if sys.platform.startswith('win'): - p = subprocess.Popen(command, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - shell=False, - universal_newlines=translate_newlines, - env=env) - else: - p = subprocess.Popen(command, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - shell=False, - close_fds=True, - universal_newlines=translate_newlines, - env=env) - if split_lines: - data = p.stdout.readlines() - else: - data = p.stdout.read() - rc = p.wait() - if rc and not ignore_errors and rc not in extra_ignore_errors: - die('Failed to execute command: %s\n%s' % (command, data)) - - return data - - -def die(msg=None): - """ - Cleanly exits the program with an error message. Erases all remaining - temporary files. - """ - for tmpfile in tempfiles: - try: - os.unlink(tmpfile) - except: - pass - - if msg: - print msg - - sys.exit(1) - - -def walk_parents(path): - """ - Walks up the tree to the root directory. - """ - while os.path.splitdrive(path)[1] != os.sep: - yield path - path = os.path.dirname(path) - - -def load_config_file(filename): - """ - Loads data from a config file. - """ - config = { - 'TREES': {}, - } - - if os.path.exists(filename): - try: - execfile(filename, config) - except: - pass - - return config - - -def tempt_fate(server, tool, changenum, diff_content=None, - parent_diff_content=None, submit_as=None, retries=3): - """ - Attempts to create a review request on a Review Board server and upload - a diff. On success, the review request path is displayed. - """ - try: - save_draft = False - - if options.rid: - review_request = server.get_review_request(options.rid) - else: - review_request = server.new_review_request(changenum, submit_as) - - if options.target_groups: - server.set_review_request_field(review_request, 'target_groups', - options.target_groups) - save_draft = True - - if options.target_people: - server.set_review_request_field(review_request, 'target_people', - options.target_people) - save_draft = True - - if options.summary: - server.set_review_request_field(review_request, 'summary', - options.summary) - save_draft = True - - if options.branch: - server.set_review_request_field(review_request, 'branch', - options.branch) - save_draft = True - - if options.bugs_closed: - server.set_review_request_field(review_request, 'bugs_closed', - options.bugs_closed) - save_draft = True - - if options.description: - server.set_review_request_field(review_request, 'description', - options.description) - save_draft = True - - if options.testing_done: - server.set_review_request_field(review_request, 'testing_done', - options.testing_done) - save_draft = True - - if save_draft: - server.save_draft(review_request) - except APIError, e: - rsp, = e.args - if rsp['err']['code'] == 103: # Not logged in - retries = retries - 1 - - # We had an odd issue where the server ended up a couple of - # years in the future. Login succeeds but the cookie date was - # "odd" so use of the cookie appeared to fail and eventually - # ended up at max recursion depth :-(. Check for a maximum - # number of retries. - if retries >= 0: - server.login(force=True) - tempt_fate(server, tool, changenum, diff_content, - parent_diff_content, submit_as, retries=retries) - return - - if options.rid: - die("Error getting review request %s: %s (code %s)" % \ - (options.rid, rsp['err']['msg'], rsp['err']['code'])) - else: - die("Error creating review request: %s (code %s)" % \ - (rsp['err']['msg'], rsp['err']['code'])) - - - if not server.info.supports_changesets or not options.change_only: - try: - server.upload_diff(review_request, diff_content, - parent_diff_content) - except APIError, e: - rsp, = e.args - print "Error uploading diff: %s (%s)" % (rsp['err']['msg'], - rsp['err']['code']) - debug(rsp) - die("Your review request still exists, but the diff is not " + - "attached.") - - if options.publish: - server.publish(review_request) - - request_url = 'r/' + str(review_request['id']) - review_url = urljoin(server.url, request_url) - - if not review_url.startswith('http'): - review_url = 'http://%s' % review_url - - print "Review request #%s posted." % (review_request['id'],) - print - print review_url - - return review_url - - -def parse_options(args): - parser = OptionParser(usage="%prog [-pond] [-r review_id] [changenum]", - version="%prog " + VERSION) - - parser.add_option("-p", "--publish", - dest="publish", action="store_true", default=PUBLISH, - help="publish the review request immediately after " - "submitting") - parser.add_option("-r", "--review-request-id", - dest="rid", metavar="ID", default=None, - help="existing review request ID to update") - parser.add_option("-o", "--open", - dest="open_browser", action="store_true", - default=OPEN_BROWSER, - help="open a web browser to the review request page") - parser.add_option("-n", "--output-diff", - dest="output_diff_only", action="store_true", - default=False, - help="outputs a diff to the console and exits. " - "Does not post") - parser.add_option("--server", - dest="server", default=REVIEWBOARD_URL, - metavar="SERVER", - help="specify a different Review Board server " - "to use") - parser.add_option("--diff-only", - dest="diff_only", action="store_true", default=False, - help="uploads a new diff, but does not update " - "info from changelist") - parser.add_option("--target-groups", - dest="target_groups", default=TARGET_GROUPS, - help="names of the groups who will perform " - "the review") - parser.add_option("--target-people", - dest="target_people", default=TARGET_PEOPLE, - help="names of the people who will perform " - "the review") - parser.add_option("--summary", - dest="summary", default=None, - help="summary of the review ") - parser.add_option("--description", - dest="description", default=None, - help="description of the review ") - parser.add_option("--description-file", - dest="description_file", default=None, - help="text file containing a description of the review") - parser.add_option("--guess-summary", - dest="guess_summary", action="store_true", - default=False, - help="guess summary from the latest commit (git/" - "hgsubversion only)") - parser.add_option("--guess-description", - dest="guess_description", action="store_true", - default=False, - help="guess description based on commits on this branch " - "(git/hgsubversion only)") - parser.add_option("--testing-done", - dest="testing_done", default=None, - help="details of testing done ") - parser.add_option("--testing-done-file", - dest="testing_file", default=None, - help="text file containing details of testing done ") - parser.add_option("--branch", - dest="branch", default=None, - help="affected branch ") - parser.add_option("--bugs-closed", - dest="bugs_closed", default=None, - help="list of bugs closed ") - parser.add_option("--revision-range", - dest="revision_range", default=None, - help="generate the diff for review based on given " - "revision range") - parser.add_option("--label", - dest="label", default=None, - help="label (ClearCase Only) ") - parser.add_option("--submit-as", - dest="submit_as", default=SUBMIT_AS, metavar="USERNAME", - help="user name to be recorded as the author of the " - "review request, instead of the logged in user") - parser.add_option("--username", - dest="username", default=None, metavar="USERNAME", - help="user name to be supplied to the reviewboard server") - parser.add_option("--password", - dest="password", default=None, metavar="PASSWORD", - help="password to be supplied to the reviewboard server") - parser.add_option("--change-only", - dest="change_only", action="store_true", - default=False, - help="updates info from changelist, but does " - "not upload a new diff (only available if your " - "repository supports changesets)") - parser.add_option("--parent", - dest="parent_branch", default=None, - metavar="PARENT_BRANCH", - help="the parent branch this diff should be against " - "(only available if your repository supports " - "parent diffs)") - parser.add_option("--p4-client", - dest="p4_client", default=None, - help="the Perforce client name that the review is in") - parser.add_option("--p4-port", - dest="p4_port", default=None, - help="the Perforce servers IP address that the review is on") - parser.add_option("--repository-url", - dest="repository_url", default=None, - help="the url for a repository for creating a diff " - "outside of a working copy (currently only supported " - "by Subversion). Requires --revision-range") - parser.add_option("-d", "--debug", - action="store_true", dest="debug", default=DEBUG, - help="display debug output") - - (globals()["options"], args) = parser.parse_args(args) - - if options.description and options.description_file: - sys.stderr.write("The --description and --description-file options " - "are mutually exclusive.\n") - sys.exit(1) - - if options.description_file: - if os.path.exists(options.description_file): - fp = open(options.description_file, "r") - options.description = fp.read() - fp.close() - else: - sys.stderr.write("The description file %s does not exist.\n" % - options.description_file) - sys.exit(1) - - if options.testing_done and options.testing_file: - sys.stderr.write("The --testing-done and --testing-done-file options " - "are mutually exclusive.\n") - sys.exit(1) - - if options.testing_file: - if os.path.exists(options.testing_file): - fp = open(options.testing_file, "r") - options.testing_done = fp.read() - fp.close() - else: - sys.stderr.write("The testing file %s does not exist.\n" % - options.testing_file) - sys.exit(1) - - if options.repository_url and not options.revision_range: - sys.stderr.write("The --repository-url option requires the " - "--revision-range option.\n") - sys.exit(1) - - return args - -def determine_client(): - - repository_info = None - tool = None - - # Try to find the SCM Client we're going to be working with. - for tool in SCMCLIENTS: - repository_info = tool.get_repository_info() - - if repository_info: - break - - if not repository_info: - if options.repository_url: - print "No supported repository could be access at the supplied url." - else: - print "The current directory does not contain a checkout from a" - print "supported source code repository." - sys.exit(1) - - # Verify that options specific to an SCM Client have not been mis-used. - if options.change_only and not repository_info.supports_changesets: - sys.stderr.write("The --change-only option is not valid for the " - "current SCM client.\n") - sys.exit(1) - - if options.parent_branch and not repository_info.supports_parent_diffs: - sys.stderr.write("The --parent option is not valid for the " - "current SCM client.\n") - sys.exit(1) - - if ((options.p4_client or options.p4_port) and \ - not isinstance(tool, PerforceClient)): - sys.stderr.write("The --p4-client and --p4-port options are not valid " - "for the current SCM client.\n") - sys.exit(1) - - return (repository_info, tool) - -def main(): - if 'USERPROFILE' in os.environ: - homepath = os.path.join(os.environ["USERPROFILE"], "Local Settings", - "Application Data") - elif 'HOME' in os.environ: - homepath = os.environ["HOME"] - else: - homepath = '' - - # Load the config and cookie files - globals()['user_config'] = \ - load_config_file(os.path.join(homepath, ".reviewboardrc")) - cookie_file = os.path.join(homepath, ".post-review-cookies.txt") - - args = parse_options(sys.argv[1:]) - - repository_info, tool = determine_client() - - # Try to find a valid Review Board server to use. - if options.server: - server_url = options.server - else: - server_url = tool.scan_for_server(repository_info) - - if not server_url: - print "Unable to find a Review Board server for this source code tree." - sys.exit(1) - - server = ReviewBoardServer(server_url, repository_info, cookie_file) - - if repository_info.supports_changesets: - changenum = tool.get_changenum(args) - else: - changenum = None - - if options.revision_range: - diff = tool.diff_between_revisions(options.revision_range, args, - repository_info) - parent_diff = None - elif options.label and isinstance(tool, ClearCaseClient): - diff, parent_diff = tool.diff_label(options.label) - else: - diff, parent_diff = tool.diff(args) - - if options.output_diff_only: - print diff - sys.exit(0) - - # Let's begin. - server.login() - - review_url = tempt_fate(server, tool, changenum, diff_content=diff, - parent_diff_content=parent_diff, - submit_as=options.submit_as) - - # Load the review up in the browser if requested to: - if options.open_browser: - try: - import webbrowser - if 'open_new_tab' in dir(webbrowser): - # open_new_tab is only in python 2.5+ - webbrowser.open_new_tab(review_url) - elif 'open_new' in dir(webbrowser): - webbrowser.open_new(review_url) - else: - os.system( 'start %s' % review_url ) - except: - print 'Error opening review URL: %s' % review_url - - -if __name__ == "__main__": - main() diff --git a/test/review b/test/review deleted file mode 100755 index e1ccb9c0af..0000000000 --- a/test/review +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -if [ -z $1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "-help" ] || [ "$1" = "-?" ]; then - echo "Usage: `basename $0` [rev] [args]\n" - echo " [rev] : either the revision number without leading 'r' (post-commit)," - echo " or '-loc' to create a review from current local changes (pre-commit)\n" - echo " [args] : optional arguments:" - echo " -r ID existing review request ID to update\n" - exit 1 -fi - -POSTREVIEW=`dirname $0`/postreview.py - -if [ "$1" = "-loc" ]; then - echo "creating review request from local changes..." - REVARG="" - LOG="" - SUMMARY="local changes" - REPO="" -else - REV=$1 - PREV=`expr $REV - 1` - if [ $? -ne 0 ]; then - echo "argument revision not a number: $REV" - exit 1 - fi - - echo "creating review request for changeset $REV..." - - LOG="`svn log http://lampsvn.epfl.ch/svn-repos/scala -c $REV`" - if [ $? -ne 0 ]; then - echo "could not get svn log for revision $REV" - exit 1 - fi - - REVARG="--revision-range=$PREV:$REV" - SUMMARY="r$REV" - REPO="--repository-url=http://lampsvn.epfl.ch/svn-repos/scala" -fi - - -shift # remove parameter $1 (revision) - -python $POSTREVIEW --server="https://chara2.epfl.ch" $REVARG --summary="$SUMMARY" --description="$LOG" $REPO -o $@ diff --git a/tools/buildcp b/tools/buildcp index 3027dec2e3..3ae70e10a3 100755 --- a/tools/buildcp +++ b/tools/buildcp @@ -8,4 +8,4 @@ lib=$($dir/abspath $dir/../lib) build=$($dir/abspath $dir/../build) cp=$($dir/cpof $build/$1/classes):$build/asm/classes -echo $cp:$lib/fjbg.jar:$lib/forkjoin.jar:$lib/jline.jar:$lib/extra/'*' +echo $cp:$lib/forkjoin.jar:$lib/jline.jar:$lib/extra/'*' diff --git a/tools/strapcp b/tools/strapcp index 6a46b4e1c8..6a4044ae24 100755 --- a/tools/strapcp +++ b/tools/strapcp @@ -6,7 +6,6 @@ strap="$dir/../build/strap/classes" [[ -d $strap ]] || { echo "Error: no directory at $strap"; exit 1; } cp=$($dir/cpof $strap) -fjbg=$($dir/abspath $dir/../lib/fjbg.jar) asm=$($dir/abspath $dir/../build/asm/classes) -echo $cp:$fjbg:$asm +echo $cp:$asm |