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

Add negateCompare() and fix typos in method names.

Browse Source
This commit is contained in:
Volker 2018-08-03 17:25:31 +02:00
parent ce82010721
commit fbe2d97fc6
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/de/inetsoftware/jwebassembly/module/BranchManger.java
View File

@ -211,16 +211,16 @@ class BranchManger {
ParsedBlock parsedBlock = parsedOperations.remove( 0 ); ParsedBlock parsedBlock = parsedOperations.remove( 0 );
switch( parsedBlock.op ) { switch( parsedBlock.op ) {
case IF: case IF:
caculateIf( parent, parsedBlock, parsedOperations ); calculateIf( parent, parsedBlock, parsedOperations );
break; break;
case SWITCH: case SWITCH:
caculateSwitch( parent, (SwitchParsedBlock)parsedBlock, parsedOperations ); calculateSwitch( parent, (SwitchParsedBlock)parsedBlock, parsedOperations );
break; break;
case GOTO: case GOTO:
caculateGoto( parent, parsedBlock, parsedOperations ); calculateGoto( parent, parsedBlock, parsedOperations );
break; break;
case LOOP: case LOOP:
caculateLoop( parent, parsedBlock, parsedOperations ); calculateLoop( parent, parsedBlock, parsedOperations );
break; break;
default: default:
throw new WasmException( "Unimplemented block code operation: " + parsedBlock.op, null, parsedBlock.lineNumber ); throw new WasmException( "Unimplemented block code operation: " + parsedBlock.op, null, parsedBlock.lineNumber );
@ -238,7 +238,7 @@ class BranchManger {
* @param parsedOperations * @param parsedOperations
* the not consumed operations in the parent branch * the not consumed operations in the parent branch
*/ */
private void caculateIf( BranchNode parent, ParsedBlock startBlock, List<ParsedBlock> parsedOperations ) { private void calculateIf( BranchNode parent, ParsedBlock startBlock, List<ParsedBlock> parsedOperations ) {
int i = 0; int i = 0;
int endPos = Math.min( startBlock.endPosition, parent.endPos ); int endPos = Math.min( startBlock.endPosition, parent.endPos );
int startPos = startBlock.startPosition + 3; int startPos = startBlock.startPosition + 3;
@ -383,7 +383,7 @@ class BranchManger {
* @param parsedOperations * @param parsedOperations
* the not consumed operations in the parent branch * the not consumed operations in the parent branch
*/ */
private void caculateSwitch( BranchNode parent, SwitchParsedBlock switchBlock, List<ParsedBlock> parsedOperations ) { private void calculateSwitch( BranchNode parent, SwitchParsedBlock switchBlock, List<ParsedBlock> parsedOperations ) {
int startPosition = ((ParsedBlock)switchBlock).startPosition; int startPosition = ((ParsedBlock)switchBlock).startPosition;
int posCount = switchBlock.positions.length; int posCount = switchBlock.positions.length;
boolean isTable = switchBlock.keys == null; boolean isTable = switchBlock.keys == null;
@ -484,7 +484,7 @@ class BranchManger {
* @param parsedOperations * @param parsedOperations
* the not consumed operations in the parent branch * the not consumed operations in the parent branch
*/ */
private void caculateGoto ( BranchNode parent, ParsedBlock gotoBlock, List<ParsedBlock> parsedOperations ) { private void calculateGoto ( BranchNode parent, ParsedBlock gotoBlock, List<ParsedBlock> parsedOperations ) {
int start = gotoBlock.endPosition; int start = gotoBlock.endPosition;
int end = gotoBlock.startPosition; int end = gotoBlock.startPosition;
if( end > start ) { if( end > start ) {
@ -511,7 +511,7 @@ class BranchManger {
* @param parsedOperations * @param parsedOperations
* the not consumed operations in the parent branch * the not consumed operations in the parent branch
*/ */
private void caculateLoop ( BranchNode parent, ParsedBlock loopBlock, List<ParsedBlock> parsedOperations ) { private void calculateLoop ( BranchNode parent, ParsedBlock loopBlock, List<ParsedBlock> parsedOperations ) {
BranchNode blockNode = new BranchNode( loopBlock.startPosition, loopBlock.endPosition, WasmBlockOperator.BLOCK, WasmBlockOperator.END ); BranchNode blockNode = new BranchNode( loopBlock.startPosition, loopBlock.endPosition, WasmBlockOperator.BLOCK, WasmBlockOperator.END );
parent.add( blockNode ); parent.add( blockNode );
BranchNode loopNode = new BranchNode( loopBlock.startPosition, loopBlock.endPosition, WasmBlockOperator.LOOP, WasmBlockOperator.END ); BranchNode loopNode = new BranchNode( loopBlock.startPosition, loopBlock.endPosition, WasmBlockOperator.LOOP, WasmBlockOperator.END );
@ -555,11 +555,11 @@ class BranchManger {
private static class ParsedBlock { private static class ParsedBlock {
private JavaBlockOperator op; private JavaBlockOperator op;
private int startPosition; int startPosition;
private int endPosition; int endPosition;
private int lineNumber; int lineNumber;
private ParsedBlock( JavaBlockOperator op, int startPosition, int offset, int lineNumber ) { private ParsedBlock( JavaBlockOperator op, int startPosition, int offset, int lineNumber ) {
this.op = op; this.op = op;
@ -588,11 +588,40 @@ class BranchManger {
* @param instr * @param instr
* the compare instruction * the compare instruction
*/ */
public IfParsedBlock( int startPosition, int offset, int lineNumber, WasmNumericInstruction instr ) { private IfParsedBlock( int startPosition, int offset, int lineNumber, WasmNumericInstruction instr ) {
super( JavaBlockOperator.IF, startPosition, offset, lineNumber ); super( JavaBlockOperator.IF, startPosition, offset, lineNumber );
this.instr = instr; this.instr = instr;
} }
/**
* Negate the compare operation.
*/
private void negate() {
NumericOperator newOp;
switch( instr.numOp ) {
case eq:
newOp = NumericOperator.ne;
break;
case ne:
newOp = NumericOperator.eq;
break;
case gt:
newOp = NumericOperator.le_s;
break;
case lt_s:
newOp = NumericOperator.ge_s;
break;
case le_s:
newOp = NumericOperator.gt;
break;
case ge_s:
newOp = NumericOperator.lt_s;
break;
default:
throw new WasmException( "Not a compare operation: " + instr.numOp, null, lineNumber );
}
instr.numOp = newOp;
}
} }
/** /**

4
src/de/inetsoftware/jwebassembly/module/WasmNumericInstruction.java
View File

@ -29,9 +29,9 @@ import javax.annotation.Nullable;
*/ */
class WasmNumericInstruction extends WasmInstruction { class WasmNumericInstruction extends WasmInstruction {
private final NumericOperator numOp; NumericOperator numOp;
private final ValueType valueType; private final ValueType valueType;
/** /**
* Create an instance of numeric operation. * Create an instance of numeric operation.