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

Write function names for debugging

Browse Source
This commit is contained in:
Volker Berlin 2018-10-13 15:29:34 +02:00
parent 3c2ec0f516
commit 8e8489ee77
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java
View File

@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -102,6 +103,7 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
writeSection( SectionType.Global, globals.values() ); writeSection( SectionType.Global, globals.values() );
writeExportSection(); writeExportSection();
writeCodeSection(); writeCodeSection();
writeDebugNames();
wasm.close(); wasm.close();
} }
@ -124,7 +126,7 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
for( SectionEntry entry : entries ) { for( SectionEntry entry : entries ) {
entry.writeSectionEntry( stream ); entry.writeSectionEntry( stream );
} }
wasm.writeSection( type, stream, null ); wasm.writeSection( type, stream );
} }
} }
@ -148,7 +150,7 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
int id = functions.get( entry.getValue() ).id; int id = functions.get( entry.getValue() ).id;
stream.writeVaruint32( id ); stream.writeVaruint32( id );
} }
wasm.writeSection( SectionType.Export, stream, null ); wasm.writeSection( SectionType.Export, stream );
} }
} }
@ -166,7 +168,36 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
WasmOutputStream stream = new WasmOutputStream(); WasmOutputStream stream = new WasmOutputStream();
stream.writeVaruint32( size ); stream.writeVaruint32( size );
functionsStream.writeTo( stream ); functionsStream.writeTo( stream );
wasm.writeSection( SectionType.Code, stream, null ); wasm.writeSection( SectionType.Code, stream );
}
/**
* Write optional the debug names into the name section
*
* @throws IOException
* if any I/O error occur
*/
private void writeDebugNames() throws IOException {
if( !debugNames ) {
return;
}
WasmOutputStream stream = new WasmOutputStream();
stream.writeString( "name" ); // Custom Section name "name", content is part of the section length
// write function names
stream.write( 1 ); // 1 - Function name
WasmOutputStream section = new WasmOutputStream();
section.writeVaruint32( functions.size() );
for( Entry<String, Function> entry : functions.entrySet() ) {
section.writeVaruint32( entry.getValue().id ); // function index
String functionName = entry.getKey();
functionName = functionName.substring( 0, functionName.indexOf( '(' ) );
section.writeString( functionName );
}
stream.writeVaruint32( section.size() );
section.writeTo( stream );
wasm.writeSection( SectionType.Custom, stream );
} }
/** /**

7
src/de/inetsoftware/jwebassembly/binary/WasmOutputStream.java
View File

@ -204,12 +204,10 @@ class WasmOutputStream extends FilterOutputStream {
* the name of the section * the name of the section
* @param data * @param data
* the data of the section * the data of the section
* @param name
* the name, must be set if the id == 0
* @throws IOException * @throws IOException
* if any I/O error occur * if any I/O error occur
*/ */
void writeSection( SectionType type, WasmOutputStream data, String name ) throws IOException { void writeSection( SectionType type, WasmOutputStream data ) throws IOException {
ByteArrayOutputStream baos = (ByteArrayOutputStream)data.out; ByteArrayOutputStream baos = (ByteArrayOutputStream)data.out;
int size = baos.size(); int size = baos.size();
if( size == 0 ) { if( size == 0 ) {
@ -217,9 +215,6 @@ class WasmOutputStream extends FilterOutputStream {
} }
writeVaruint32( type.ordinal() ); writeVaruint32( type.ordinal() );
writeVaruint32( size ); writeVaruint32( size );
if( type == SectionType.Custom ) {
writeString( name );
}
baos.writeTo( this ); baos.writeTo( this );
} }