# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1407773867 -7200
# Node ID 223db336eed89fd46d94b077b844deaad1796f3b
# Parent  e6ff54a8dff600f86cbde9c602206162bfc80afb# Parent  03f1dd008e832055c7d657f5b58daf0d4009a8b9
Merging two heads on default branch

diff -r e6ff54a8dff6 -r 223db336eed8 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java
--- a/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java	Fri Jul 25 14:27:04 2014 +0200
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java	Mon Aug 11 18:17:47 2014 +0200
@@ -114,7 +114,17 @@
 
         return (trueCount == 1) ? result : -2;
     }
-
+    
+    @Compare public int parameterSlotCount() {
+        long argCounts = 281479271874563L;
+        int x = unpack(argCounts, 2);
+        return x;
+    }
+    private static char unpack(long packed, int word) { // word==0 => return a, ==3 => return d
+        assert(word <= 3);
+        final long val = packed >> ((3-word) * 16);
+        return (char)val;
+    }
     @Compare public long conversion() {
         return Long.MAX_VALUE;
     }
diff -r e6ff54a8dff6 -r 223db336eed8 rt/vm/pom.xml
--- a/rt/vm/pom.xml	Fri Jul 25 14:27:04 2014 +0200
+++ b/rt/vm/pom.xml	Mon Aug 11 18:17:47 2014 +0200
@@ -76,51 +76,6 @@
                  <skip>false</skip>
              </configuration>
          </plugin>
-         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
-             <artifactId>exec-maven-plugin</artifactId>
-             <version>1.2.1</version>
-             <executions>
-                 <execution>
-                     <id>generate-js</id>
-                     <phase>process-classes</phase>
-                     <configuration>
-                         <executable>java</executable>
-                        <arguments>
-                            <argument>-Dskip.if.exists=true</argument>
-                            <argument>-cp</argument>
-                            <classpath />
-                            <argument>org.apidesign.vm4brwsr.Main</argument>
-                            <argument>--obfuscatelevel</argument>
-                            <argument>${bck2brwsr.obfuscationlevel}</argument>
-                            <argument>${project.build.directory}/bck2brwsr.js</argument>
-                            <argument>org/apidesign/vm4brwsr/Bck2Brwsr</argument>
-                        </arguments>
-                     </configuration>
-                     <goals>
-                         <goal>exec</goal>
-                     </goals>
-                 </execution>
-             </executions>
-         </plugin>
-         <plugin>
-             <artifactId>maven-assembly-plugin</artifactId>
-             <version>2.4</version>
-             <executions>
-                 <execution>
-                     <id>js</id>
-                     <phase>package</phase>
-                     <goals>
-                         <goal>single</goal>
-                     </goals>
-                     <configuration>
-                         <descriptors>
-                             <descriptor>src/main/assembly/bck2brwsr.xml</descriptor>
-                         </descriptors>
-                     </configuration>
-                 </execution>
-             </executions>                
-         </plugin>      
       </plugins>
   </build>
   <dependencies>
diff -r e6ff54a8dff6 -r 223db336eed8 rt/vm/src/main/assembly/bck2brwsr.xml
--- a/rt/vm/src/main/assembly/bck2brwsr.xml	Fri Jul 25 14:27:04 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Back 2 Browser Bytecode Translator
-    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, version 2 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. Look for COPYING file in the top folder.
-    If not, see http://opensource.org/licenses/GPL-2.0.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  
-  <id>js</id>
-  <formats>
-      <format>zip</format>
-  </formats>
-  <baseDirectory>/</baseDirectory>
-  <files>
-    <file>
-      <source>${project.build.directory}/bck2brwsr.js</source>
-      <outputDirectory>/</outputDirectory>
-    </file>
-  </files>
-
-</assembly>
\ No newline at end of file
diff -r e6ff54a8dff6 -r 223db336eed8 rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri Jul 25 14:27:04 2014 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Mon Aug 11 18:17:47 2014 +0200
@@ -846,7 +846,6 @@
                     smapper.replace(this, VarType.INTEGER, "(@1).toInt8()", smapper.getI(0));
                     break;
                 case opc_i2c:
-                    break;
                 case opc_i2s:
                     smapper.replace(this, VarType.INTEGER, "(@1).toInt16()", smapper.getI(0));
                     break;