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

Replace the fix length of 3 byte for GOTO with a nextPosition because goto_w use 5 bytes.

Browse Source
This commit is contained in:
Volker Berlin 2019-03-19 19:35:42 +01:00
parent 0b49204793
commit 1b6fd3c7a5
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,11 +86,13 @@ class BranchManger {
* the byte position of the start position * the byte position of the start position
* @param offset * @param offset
* the relative jump position * the relative jump position
* @param nextPosition
* the position of the next instruction
* @param lineNumber * @param lineNumber
* the current line number * the current line number
*/ */
void addGotoOperator( int startPosition, int offset, int lineNumber ) { void addGotoOperator( int startPosition, int offset, int nextPosition, int lineNumber ) {
allParsedOperations.add( new ParsedBlock( JavaBlockOperator.GOTO, startPosition, offset, lineNumber ) ); allParsedOperations.add( new ParsedBlock( JavaBlockOperator.GOTO, startPosition, offset, nextPosition, lineNumber ) );
} }
/** /**
@ -152,10 +154,10 @@ class BranchManger {
int start = parsedBlock.endPosition; int start = parsedBlock.endPosition;
ParsedBlock loop = loops.get( start ); ParsedBlock loop = loops.get( start );
if( loop == null ) { if( loop == null ) {
loop = new ParsedBlock( JavaBlockOperator.LOOP, start, 0, parsedBlock.lineNumber ); loop = new ParsedBlock( JavaBlockOperator.LOOP, start, 0, start, parsedBlock.lineNumber );
loops.put( start, loop ); loops.put( start, loop );
} }
loop.endPosition = parsedBlock.startPosition + 3; loop.endPosition = parsedBlock.nextPosition;
break; break;
default: default:
throw new WasmException( "Unimplemented loop code operation: " + parsedBlock.op, null, null, parsedBlock.lineNumber ); throw new WasmException( "Unimplemented loop code operation: " + parsedBlock.op, null, null, parsedBlock.lineNumber );
@ -174,12 +176,12 @@ class BranchManger {
// CONDITION: // CONDITION:
// if<cond> START: // if<cond> START:
// we can not match this in WASM because a missing GOTO that we need to move the condition to the start of the loop // we can not match this in WASM because a missing GOTO that we need to move the condition to the start of the loop
int nextPos = parsedBlock.startPosition + 3; int nextPos = parsedBlock.nextPosition;
for( int n = b + 1; n < allParsedOperations.size(); n++ ) { for( int n = b + 1; n < allParsedOperations.size(); n++ ) {
ParsedBlock nextBlock = allParsedOperations.get( n ); ParsedBlock nextBlock = allParsedOperations.get( n );
if( nextBlock.op == JavaBlockOperator.IF && nextBlock.endPosition == nextPos ) { if( nextBlock.op == JavaBlockOperator.IF && nextBlock.endPosition == nextPos ) {
int conditionStart = parsedBlock.endPosition; // 15 int conditionStart = parsedBlock.endPosition; // 15
int conditionEnd = nextBlock.startPosition + 3; // 22 int conditionEnd = nextBlock.nextPosition; // 22
int conditionNew = parsedBlock.startPosition; // 4 int conditionNew = parsedBlock.startPosition; // 4
int conditionIdx = -1; int conditionIdx = -1;
@ -262,7 +264,7 @@ class BranchManger {
private void calculateIf( BranchNode parent, IfParsedBlock startBlock, List<ParsedBlock> parsedOperations ) { private void calculateIf( BranchNode parent, IfParsedBlock 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.nextPosition;
if( startPos > endPos ) { if( startPos > endPos ) {
// the condition in a do while(condition) loop // the condition in a do while(condition) loop
parent.add( new BranchNode( startPos, startPos, WasmBlockOperator.BR_IF, null, 0 ) ); parent.add( new BranchNode( startPos, startPos, WasmBlockOperator.BR_IF, null, 0 ) );
@ -717,12 +719,15 @@ class BranchManger {
int endPosition; int endPosition;
int nextPosition;
int lineNumber; int lineNumber;
private ParsedBlock( JavaBlockOperator op, int startPosition, int offset, int lineNumber ) { private ParsedBlock( JavaBlockOperator op, int startPosition, int offset, int nextPosition, int lineNumber ) {
this.op = op; this.op = op;
this.startPosition = startPosition; this.startPosition = startPosition;
this.endPosition = startPosition + offset; this.endPosition = startPosition + offset;
this.nextPosition = nextPosition;
this.lineNumber = lineNumber; this.lineNumber = lineNumber;
} }
} }
@ -747,7 +752,7 @@ class BranchManger {
* the compare instruction * the compare instruction
*/ */
private 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, startPosition + 3, lineNumber );
this.instr = instr; this.instr = instr;
} }
@ -805,7 +810,7 @@ class BranchManger {
private int defaultPosition; private int defaultPosition;
public SwitchParsedBlock( int startPosition, int offset, int lineNumber, int[] keys, int[] positions, int defaultPosition ) { public SwitchParsedBlock( int startPosition, int offset, int lineNumber, int[] keys, int[] positions, int defaultPosition ) {
super( JavaBlockOperator.SWITCH, startPosition, offset, lineNumber ); super( JavaBlockOperator.SWITCH, startPosition, offset, startPosition, lineNumber );
this.keys = keys; this.keys = keys;
this.positions = positions; this.positions = positions;
this.defaultPosition = defaultPosition; this.defaultPosition = defaultPosition;
@ -819,7 +824,7 @@ class BranchManger {
private final TryCatchFinally tryCatch; private final TryCatchFinally tryCatch;
TryCatchParsedBlock( TryCatchFinally tryCatch ) { TryCatchParsedBlock( TryCatchFinally tryCatch ) {
super( JavaBlockOperator.TRY, tryCatch.getStart(), 0, -1 ); super( JavaBlockOperator.TRY, tryCatch.getStart(), 0, tryCatch.getStart(), -1 );
this.tryCatch = tryCatch; this.tryCatch = tryCatch;
} }
} }

2
src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java
View File

@ -511,7 +511,7 @@ class JavaMethodWasmCodeBuilder extends WasmCodeBuilder {
break; break;
case 167: // goto case 167: // goto
int offset = byteCode.readShort(); int offset = byteCode.readShort();
branchManager.addGotoOperator( codePos, offset, byteCode.getLineNumber() ); branchManager.addGotoOperator( codePos, offset, byteCode.getCodePosition(), byteCode.getLineNumber() );
addNopInstruction( codePos ); // marker of the line number for the branch manager addNopInstruction( codePos ); // marker of the line number for the branch manager
break; break;
//TODO case 168: // jsr //TODO case 168: // jsr