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

use experimental Sign-extension operators

Browse Source
This commit is contained in:
Volker 2018-08-03 21:49:42 +02:00
parent ec10240c52
commit a27733234f
6 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -654,6 +654,12 @@ public class BinaryModuleWriter extends ModuleWriter implements InstructionOpcod
case d2f: case d2f:
op = F32_DEMOTE_F64; op = F32_DEMOTE_F64;
break; break;
case i2b:
op = I32_EXTEND8_S;
break;
case i2s:
op = I32_EXTEND16_S;
break;
default: default:
throw new Error( "Unknown cast: " + cast ); throw new Error( "Unknown cast: " + cast );
} }

14
src/de/inetsoftware/jwebassembly/binary/InstructionOpcodes.java
View File

@ -335,7 +335,19 @@ interface InstructionOpcodes {
static final int F64_PROMOTE_F32 = 0xBB; static final int F64_PROMOTE_F32 = 0xBB;
// === numerical operations ====== // === Sign-extension operators ====== https://github.com/WebAssembly/design/issues/1178
static final int I32_EXTEND8_S = 0xC0;
static final int I32_EXTEND16_S = 0xC1;
static final int I64_EXTEND8_S = 0xC2;
static final int I64_EXTEND16_S = 0xC3;
static final int I64_EXTEND32_S = 0xC4;
// === ref values ====== https://github.com/WebAssembly/design/issues/1203
static final int REF_NULL = 0xD0; static final int REF_NULL = 0xD0;

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

@ -603,20 +603,14 @@ public class ModuleGenerator {
instr = new WasmConvertInstruction( ValueTypeConvertion.d2f, codePos ); instr = new WasmConvertInstruction( ValueTypeConvertion.d2f, codePos );
break; break;
case 145: // i2b case 145: // i2b
instructions.add( new WasmConstInstruction( 24, codePos ) ); instr = new WasmConvertInstruction( ValueTypeConvertion.i2b, codePos );
instructions.add( new WasmNumericInstruction( NumericOperator.shl, ValueType.i32, codePos ) );
instructions.add( new WasmConstInstruction( 24, codePos ) );
instr = new WasmNumericInstruction( NumericOperator.shr_s, ValueType.i32, codePos );
break; break;
case 146: // i2c case 146: // i2c
instructions.add( new WasmConstInstruction( 0xFFFF, codePos ) ); instructions.add( new WasmConstInstruction( 0xFFFF, codePos ) );
instr = new WasmNumericInstruction( NumericOperator.and, ValueType.i32, codePos ); instr = new WasmNumericInstruction( NumericOperator.and, ValueType.i32, codePos );
break; break;
case 147: // i2s case 147: // i2s
instructions.add( new WasmConstInstruction( 16, codePos ) ); instr = new WasmConvertInstruction( ValueTypeConvertion.i2s, codePos );
instructions.add( new WasmNumericInstruction( NumericOperator.shl, ValueType.i32, codePos ) );
instructions.add( new WasmConstInstruction( 16, codePos ) );
instr = new WasmNumericInstruction( NumericOperator.shr_s, ValueType.i32, codePos );
break; break;
case 148: // lcmp case 148: // lcmp
opCompare( ValueType.i64, byteCode, codePos ); opCompare( ValueType.i64, byteCode, codePos );

5
src/de/inetsoftware/jwebassembly/module/ValueTypeConvertion.java
View File

@ -15,8 +15,6 @@
*/ */
package de.inetsoftware.jwebassembly.module; package de.inetsoftware.jwebassembly.module;
import java.io.IOException;
/** /**
* Cast operations for converting one data type to another * Cast operations for converting one data type to another
* *
@ -36,4 +34,7 @@ public enum ValueTypeConvertion {
d2i, d2i,
d2l, d2l,
d2f, d2f,
i2b,
i2c,
i2s,
} }

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

@ -232,6 +232,12 @@ public class TextModuleWriter extends ModuleWriter {
case d2f: case d2f:
op = "f32.demote/f64"; op = "f32.demote/f64";
break; break;
case i2b:
op = "i32.extend8_s";
break;
case i2s:
op = "i32.extend16_s";
break;
default: default:
throw new Error( "Unknown cast: " + cast ); throw new Error( "Unknown cast: " + cast );
} }

2
test/de/inetsoftware/jwebassembly/WasmRule.java
View File

@ -257,7 +257,7 @@ public class WasmRule extends TemporaryFolder {
private ProcessBuilder nodeJsCommand() { private ProcessBuilder nodeJsCommand() {
String command = System.getProperty( "node.dir" ); String command = System.getProperty( "node.dir" );
command = command == null ? "node" : command + "/node"; command = command == null ? "node" : command + "/node";
return new ProcessBuilder( command, nodeScript.getAbsolutePath() ); return new ProcessBuilder( command, "--experimental-wasm-se", nodeScript.getAbsolutePath() );
} }
/** /**