backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

save mapping between function and type.

Browse Source
This commit is contained in:
Volker Berlin 2019-06-01 18:42:24 +02:00
parent 6468df956f
commit 57a2bd0827
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java
View File

@ -20,7 +20,9 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -47,29 +49,33 @@ import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator;
*/ */
public class TextModuleWriter extends ModuleWriter { public class TextModuleWriter extends ModuleWriter {
private final boolean spiderMonkey = Boolean.getBoolean( "SpiderMonkey" ); private final boolean spiderMonkey = Boolean.getBoolean( "SpiderMonkey" );
private Appendable output; private Appendable output;
private final boolean debugNames; private final boolean debugNames;
private final ByteArrayOutputStream dataStream = new ByteArrayOutputStream(); private final ByteArrayOutputStream dataStream = new ByteArrayOutputStream();
private final ArrayList<String> methodParamNames = new ArrayList<>(); private final ArrayList<String> methodParamNames = new ArrayList<>();
private StringBuilder typeOutput = new StringBuilder(); private StringBuilder typeOutput = new StringBuilder();
private ArrayList<String> types = new ArrayList<>(); private ArrayList<String> types = new ArrayList<>();
private StringBuilder methodOutput = new StringBuilder(); private StringBuilder methodOutput = new StringBuilder();
private int inset; private FunctionName function;
private boolean isImport; private Map<String, Integer> functions = new LinkedHashMap<>();
private HashSet<String> globals = new HashSet<>(); private int inset;
private boolean useExceptions; private boolean isImport;
private HashSet<String> globals = new HashSet<>();
private boolean useExceptions;
private int importCount; private int importCount;
@ -239,6 +245,7 @@ public class TextModuleWriter extends ModuleWriter {
*/ */
@Override @Override
protected void writeMethodStart( FunctionName name, String sourceFile ) throws IOException { protected void writeMethodStart( FunctionName name, String sourceFile ) throws IOException {
function = name;
typeOutput.setLength( 0 ); typeOutput.setLength( 0 );
newline( methodOutput ); newline( methodOutput );
methodOutput.append( "(func $" ); methodOutput.append( "(func $" );
@ -301,6 +308,8 @@ public class TextModuleWriter extends ModuleWriter {
idx = types.size(); idx = types.size();
types.add( typeStr ); types.add( typeStr );
} }
functions.put( function.signatureName, idx );
if( isImport ) { if( isImport ) {
isImport = false; isImport = false;
methodOutput.append( "))" ); methodOutput.append( "))" );
@ -557,7 +566,7 @@ public class TextModuleWriter extends ModuleWriter {
newline( methodOutput ); newline( methodOutput );
methodOutput.append( "i32.load offset=" ).append( virtualFunctionIdx * 4 ); // use default alignment methodOutput.append( "i32.load offset=" ).append( virtualFunctionIdx * 4 ); // use default alignment
newline( methodOutput ); newline( methodOutput );
methodOutput.append( "call_indirect (type $" ).append( normalizeName( name ) ).append( ')' ); methodOutput.append( "call_indirect (type $t" ).append( functions.get( name.signatureName ) ).append( ')' );
} }
/** /**