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

Move the end handling of a method into writeCode() to hold all code

Browse Source 
operation together
This commit is contained in:
Volker 2018-06-21 18:09:19 +02:00
parent 7c9a081e96
commit c6ca470003
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java
View File

@ -165,31 +165,8 @@ public class ModuleGenerator {
branchManager.calculate(); branchManager.calculate();
localVariables.calculate(); localVariables.calculate();
boolean endWithReturn = false;
byteCode = code.getByteCode(); byteCode = code.getByteCode();
endWithReturn = writeCode( byteCode, method.getConstantPool() ); writeCode( byteCode, method.getConstantPool() );
branchManager.handle( byteCode, writer ); // write the last end operators
if( !endWithReturn && returnType != null ) {
// if a method ends with a loop without a break then code after the loop is no reachable
// Java does not need a return byte code in this case
// But WebAssembly need the dead code to validate
switch( returnType ) {
case i32:
writer.writeConstInt( 0 );
break;
case i64:
writer.writeConstLong( 0 );
break;
case f32:
writer.writeConstFloat( 0 );
break;
case f64:
writer.writeConstDouble( 0 );
break;
default:
}
writer.writeBlockCode( WasmBlockOperator.RETURN, null );
}
writer.writeMethodFinish( localVariables.getLocalTypes( paramCount ) ); writer.writeMethodFinish( localVariables.getLocalTypes( paramCount ) );
} }
} catch( Exception ioex ) { } catch( Exception ioex ) {
@ -538,9 +515,8 @@ public class ModuleGenerator {
* the constant pool of the the current class * the constant pool of the the current class
* @throws WasmException * @throws WasmException
* if some Java code can't converted * if some Java code can't converted
* @return true, if the last operation was a return
*/ */
private boolean writeCode( CodeInputStream byteCode, ConstantPool constantPool ) throws WasmException { private void writeCode( CodeInputStream byteCode, ConstantPool constantPool ) throws WasmException {
boolean endWithReturn = false; boolean endWithReturn = false;
try { try {
while( byteCode.available() > 0 ) { while( byteCode.available() > 0 ) {
@ -916,12 +892,33 @@ public class ModuleGenerator {
throw new WasmException( "Unimplemented Java byte code operation: " + op, sourceFile, byteCode.getLineNumber() ); throw new WasmException( "Unimplemented Java byte code operation: " + op, sourceFile, byteCode.getLineNumber() );
} }
} }
branchManager.handle( byteCode, writer ); // write the last end operators
if( !endWithReturn && returnType != null ) {
// if a method ends with a loop without a break then code after the loop is no reachable
// Java does not need a return byte code in this case
// But WebAssembly need the dead code to validate
switch( returnType ) {
case i32:
writer.writeConstInt( 0 );
break;
case i64:
writer.writeConstLong( 0 );
break;
case f32:
writer.writeConstFloat( 0 );
break;
case f64:
writer.writeConstDouble( 0 );
break;
default:
}
writer.writeBlockCode( WasmBlockOperator.RETURN, null );
}
} catch( WasmException ex ) { } catch( WasmException ex ) {
throw ex; throw ex;
} catch( Exception ex ) { } catch( Exception ex ) {
throw WasmException.create( ex, sourceFile, byteCode.getLineNumber() ); throw WasmException.create( ex, sourceFile, byteCode.getLineNumber() );
} }
return endWithReturn;
} }
/** /**