fix structure problems with globals in text writer.

Author: Volker

src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java

@@ -56,6 +56,8 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
 
     private Map<String, Function>       functions           = new LinkedHashMap<>();
 
+    private List<ValueType>             locals;
+
     private Map<String, Global>         globals             = new LinkedHashMap<>();
 
     private Map<String, String>         exports             = new LinkedHashMap<>();
@@ -301,20 +303,21 @@ protected void writeMethodParam( String kind, ValueType valueType ) throws IOExc
      * {@inheritDoc}
      */
     @Override
-    protected void writeMethodParamFinish() throws IOException {
+    protected void writeMethodParamFinish( List<ValueType> locals ) throws IOException {
         int typeId = functionTypes.indexOf( functionType );
         if( typeId < 0 ) {
             typeId = functionTypes.size();
             functionTypes.add( functionType );
         }
         function.typeId = typeId;
+        this.locals = locals;
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    protected void writeMethodFinish( List<ValueType> locals ) throws IOException {
+    protected void writeMethodFinish() throws IOException {
         WasmOutputStream localsStream = new WasmOutputStream();
         localsStream.writeVaruint32( locals.size() );
         for( ValueType valueType : locals ) {

src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java

@@ -41,8 +41,6 @@ public class ModuleGenerator {
 
     private final ModuleWriter          writer;
 
-    private int                         paramCount;
-
     private ValueType                   returnType;
 
     private LocaleVariableManager       localVariables = new LocaleVariableManager();
@@ -157,19 +155,19 @@ private void writeMethod( MethodInfo method ) throws WasmException {
                 FunctionName name = new FunctionName( method );
                 writeExport( name, method );
                 writer.writeMethodStart( name );
-                writeMethodSignature( method );
 
                 localVariables.reset();
                 branchManager.reset();
 
                 byteCode = code.getByteCode();
                 writeCode( byteCode, method.getConstantPool() );
                 localVariables.calculate();
+                writeMethodSignature( method );
 
                 for( WasmInstruction instruction : instructions ) {
                     instruction.writeTo( writer );
                 }
-                writer.writeMethodFinish( localVariables.getLocalTypes( paramCount ) );
+                writer.writeMethodFinish();
             }
         } catch( Exception ioex ) {
             int lineNumber = byteCode == null ? -1 : byteCode.getLineNumber();
@@ -215,19 +213,20 @@ private void writeMethodSignature( MethodInfo method ) throws IOException, WasmE
         int paramCount = 0;
         ValueType type = null;
         for( int i = 1; i < signature.length(); i++ ) {
-            paramCount++;
             if( signature.charAt( i ) == ')' ) {
-                this.paramCount = paramCount - 1;
                 kind = "result";
                 continue;
             }
+            if( kind == "param" ) {
+                paramCount++;
+            }
             type = ValueType.getValueType( signature, i );
             if( type != null ) {
                 writer.writeMethodParam( kind, type );
             }
         }
         this.returnType = type;
-        writer.writeMethodParamFinish();
+        writer.writeMethodParamFinish( localVariables.getLocalTypes( paramCount ) );
     }
 
     /**

src/de/inetsoftware/jwebassembly/module/ModuleWriter.java

@@ -98,21 +98,22 @@ protected void prepareFunction( FunctionName name ) {}
     /**
      * Finish the function parameter.
      * 
+     * @param locals
+     *            a list with types of local variables
+     * 
+     * 
      * @throws IOException
      *             if any I/O error occur
      */
-    protected abstract void writeMethodParamFinish() throws IOException;
+    protected abstract void writeMethodParamFinish( List<ValueType> locals ) throws IOException;
 
     /**
      * Complete the method
      * 
-     * @param locals
-     *            a list with types of local variables
-     * 
      * @throws IOException
      *             if any I/O error occur
      */
-    protected abstract void writeMethodFinish( List<ValueType> locals ) throws IOException;
+    protected abstract void writeMethodFinish( ) throws IOException;
 
     /**
      * Write a constant number value

src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java

@@ -98,40 +98,41 @@ protected void writeExport( FunctionName name, String exportName ) throws IOExce
      */
     @Override
     protected void writeMethodStart( FunctionName name ) throws IOException {
-        newline( output );
-        output.append( "(func $" );
-        output.append( name.fullName );
-        inset++;
         methodOutput.setLength( 0 );
+        newline( methodOutput );
+        methodOutput.append( "(func $" );
+        methodOutput.append( name.fullName );
+        inset++;
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     protected void writeMethodParam( String kind, ValueType valueType ) throws IOException {
-        output.append( " (" ).append( kind ).append( ' ' ).append( valueType.toString() ).append( ')' );
+        methodOutput.append( " (" ).append( kind ).append( ' ' ).append( valueType.toString() ).append( ')' );
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    protected void writeMethodParamFinish() throws IOException {
+    protected void writeMethodParamFinish( List<ValueType> locals ) throws IOException {
         if( isImport ) {
             isImport = false;
             output.append( "))" );
+        } else {
+            for( ValueType valueType : locals ) {
+                methodOutput.append( " (local " ).append( valueType.toString() ).append( ')' );
+            }
         }
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    protected void writeMethodFinish( List<ValueType> locals ) throws IOException {
-        for( ValueType valueType : locals ) {
-            output.append( " (local " ).append( valueType.toString() ).append( ')' );
-        }
+    protected void writeMethodFinish() throws IOException {
         output.append( methodOutput );
         inset--;
         newline( output );
@@ -174,11 +175,11 @@ protected void writeGlobalAccess( boolean load, FunctionName name, ConstantRef r
             // declare global variable if not already declared.
             output.append( "\n  " );
             String type = ValueType.getValueType( ref.getType(), 0 ).toString();
-            output.append( "(global $" ).append( name.fullName ).append( type ).append( ' ' ).append( type ).append( ".const 0)" );
+            output.append( "(global $" ).append( name.fullName ).append( " (mut " ).append( type ).append( ") " ).append( type ).append( ".const 0)" );
             globals.add( name.fullName );
         }
         newline( methodOutput );
-        methodOutput.append( load ? "get_local " : "set_local " ).append( name.fullName );
+        methodOutput.append( load ? "get_global $" : "set_global $" ).append( name.fullName );
     }
 
     /**