1.1 --- a/pom.xml Mon Aug 11 18:19:38 2014 +0200
1.2 +++ b/pom.xml Mon Aug 11 20:10:46 2014 +0200
1.3 @@ -15,7 +15,7 @@
1.4 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1.5 <netbeans.version>RELEASE80</netbeans.version>
1.6 <license>COPYING</license>
1.7 - <net.java.html.version>0.8.2</net.java.html.version>
1.8 + <net.java.html.version>0.8.3</net.java.html.version>
1.9 <netbeans.compile.on.save>none</netbeans.compile.on.save>
1.10 </properties>
1.11 <modules>
2.1 --- a/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java Mon Aug 11 18:19:38 2014 +0200
2.2 +++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java Mon Aug 11 20:10:46 2014 +0200
2.3 @@ -117,11 +117,13 @@
2.4
2.5 @Compare public int parameterSlotCount() {
2.6 long argCounts = 281479271874563L;
2.7 - return unpack(argCounts, 2);
2.8 + int x = unpack(argCounts, 2);
2.9 + return x;
2.10 }
2.11 private static char unpack(long packed, int word) { // word==0 => return a, ==3 => return d
2.12 assert(word <= 3);
2.13 - return (char)(packed >> ((3-word) * 16));
2.14 + final long val = packed >> ((3-word) * 16);
2.15 + return (char)val;
2.16 }
2.17 @Compare public long conversion() {
2.18 return Long.MAX_VALUE;
3.1 --- a/rt/vm/pom.xml Mon Aug 11 18:19:38 2014 +0200
3.2 +++ b/rt/vm/pom.xml Mon Aug 11 20:10:46 2014 +0200
3.3 @@ -76,51 +76,6 @@
3.4 <skip>false</skip>
3.5 </configuration>
3.6 </plugin>
3.7 - <plugin>
3.8 - <groupId>org.codehaus.mojo</groupId>
3.9 - <artifactId>exec-maven-plugin</artifactId>
3.10 - <version>1.2.1</version>
3.11 - <executions>
3.12 - <execution>
3.13 - <id>generate-js</id>
3.14 - <phase>process-classes</phase>
3.15 - <configuration>
3.16 - <executable>java</executable>
3.17 - <arguments>
3.18 - <argument>-Dskip.if.exists=true</argument>
3.19 - <argument>-cp</argument>
3.20 - <classpath />
3.21 - <argument>org.apidesign.vm4brwsr.Main</argument>
3.22 - <argument>--obfuscatelevel</argument>
3.23 - <argument>${bck2brwsr.obfuscationlevel}</argument>
3.24 - <argument>${project.build.directory}/bck2brwsr.js</argument>
3.25 - <argument>org/apidesign/vm4brwsr/Bck2Brwsr</argument>
3.26 - </arguments>
3.27 - </configuration>
3.28 - <goals>
3.29 - <goal>exec</goal>
3.30 - </goals>
3.31 - </execution>
3.32 - </executions>
3.33 - </plugin>
3.34 - <plugin>
3.35 - <artifactId>maven-assembly-plugin</artifactId>
3.36 - <version>2.4</version>
3.37 - <executions>
3.38 - <execution>
3.39 - <id>js</id>
3.40 - <phase>package</phase>
3.41 - <goals>
3.42 - <goal>single</goal>
3.43 - </goals>
3.44 - <configuration>
3.45 - <descriptors>
3.46 - <descriptor>src/main/assembly/bck2brwsr.xml</descriptor>
3.47 - </descriptors>
3.48 - </configuration>
3.49 - </execution>
3.50 - </executions>
3.51 - </plugin>
3.52 </plugins>
3.53 </build>
3.54 <dependencies>
4.1 --- a/rt/vm/src/main/assembly/bck2brwsr.xml Mon Aug 11 18:19:38 2014 +0200
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,36 +0,0 @@
4.4 -<?xml version="1.0"?>
4.5 -<!--
4.6 -
4.7 - Back 2 Browser Bytecode Translator
4.8 - Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
4.9 -
4.10 - This program is free software: you can redistribute it and/or modify
4.11 - it under the terms of the GNU General Public License as published by
4.12 - the Free Software Foundation, version 2 of the License.
4.13 -
4.14 - This program is distributed in the hope that it will be useful,
4.15 - but WITHOUT ANY WARRANTY; without even the implied warranty of
4.16 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4.17 - GNU General Public License for more details.
4.18 -
4.19 - You should have received a copy of the GNU General Public License
4.20 - along with this program. Look for COPYING file in the top folder.
4.21 - If not, see http://opensource.org/licenses/GPL-2.0.
4.22 -
4.23 --->
4.24 -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4.25 - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
4.26 -
4.27 - <id>js</id>
4.28 - <formats>
4.29 - <format>zip</format>
4.30 - </formats>
4.31 - <baseDirectory>/</baseDirectory>
4.32 - <files>
4.33 - <file>
4.34 - <source>${project.build.directory}/bck2brwsr.js</source>
4.35 - <outputDirectory>/</outputDirectory>
4.36 - </file>
4.37 - </files>
4.38 -
4.39 -</assembly>
4.40 \ No newline at end of file
5.1 --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Mon Aug 11 18:19:38 2014 +0200
5.2 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Mon Aug 11 20:10:46 2014 +0200
5.3 @@ -846,7 +846,6 @@
5.4 smapper.replace(this, VarType.INTEGER, "(@1).toInt8()", smapper.getI(0));
5.5 break;
5.6 case opc_i2c:
5.7 - break;
5.8 case opc_i2s:
5.9 smapper.replace(this, VarType.INTEGER, "(@1).toInt16()", smapper.getI(0));
5.10 break;