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

use 2 slots for 64 bit params from signature

Browse Source
This commit is contained in:
Volker Berlin 2022-01-08 22:17:17 +01:00
parent 2205c68a14
commit 3027f4f9b6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/de/inetsoftware/jwebassembly/module/LocaleVariableManager.java
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2018 - 2021 Volker Berlin (i-net software) Copyright 2018 - 2022 Volker Berlin (i-net software)
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -30,6 +30,7 @@ import de.inetsoftware.classparser.LocalVariableTable;
import de.inetsoftware.classparser.MethodInfo; import de.inetsoftware.classparser.MethodInfo;
import de.inetsoftware.jwebassembly.WasmException; import de.inetsoftware.jwebassembly.WasmException;
import de.inetsoftware.jwebassembly.wasm.AnyType; import de.inetsoftware.jwebassembly.wasm.AnyType;
import de.inetsoftware.jwebassembly.wasm.ValueType;
import de.inetsoftware.jwebassembly.wasm.ValueTypeParser; import de.inetsoftware.jwebassembly.wasm.ValueTypeParser;
/** /**
@ -161,15 +162,22 @@ class LocaleVariableManager {
// add missing slots from signature // add missing slots from signature
if( (maxLocals > 0 || variableTable == null) && size == 0 && (method != null || signature != null )) { if( (maxLocals > 0 || variableTable == null) && size == 0 && (method != null || signature != null )) {
Iterator<AnyType> parser = signature == null ? new ValueTypeParser( method.getType(), types ) : signature; Iterator<AnyType> parser = signature == null ? new ValueTypeParser( method.getType(), types ) : signature;
int slot = 0;
if( method != null && !method.isStatic() ) { if( method != null && !method.isStatic() ) {
resetAddVar( types.valueOf( method.getClassName() ), size ); // the first parameter is THIS
resetAddVar( types.valueOf( method.getClassName() ), 0 );
slot++;
} }
while( true ) { while( true ) {
AnyType type = parser.next(); AnyType type = parser.next();
if( type == null ) { if( type == null ) {
break; break;
} }
resetAddVar( type, size ); resetAddVar( type, slot++ );
if( type == ValueType.i64 || type == ValueType.f64 ) {
// 64bit values use two slots in Java
slot++;
}
} }
} }