backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-14 18:43:27 +01:00
Code Issues Projects Releases Activity

more Java 11 Unsafe replacements

Browse Source
This commit is contained in:
Volker Berlin 2022-10-02 20:25:36 +02:00
parent 577d2883c9
commit 579288d663
No known key found for this signature in database
GPG Key ID: 988423EF815BE4CB
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/de/inetsoftware/jwebassembly/module/UnsafeManager.java
View File

@ -163,8 +163,15 @@ class UnsafeManager {
case "jdk/internal/misc/Unsafe.isBigEndian()Z":
patch_isBigEndian( instructions, idx, callInst );
break;
case "jdk/internal/misc/Unsafe.shouldBeInitialized(Ljava/lang/Class;)Z":
replaceWithConstNumber( instructions, idx, callInst, 2, 0 );
break;
case "jdk/internal/misc/Unsafe.storeFence()V":
remove( instructions, idx, callInst );
remove( instructions, idx, callInst, 1 );
break;
case "jdk/internal/misc/Unsafe.ensureClassInitialized(Ljava/lang/Class;)V":
case "jdk/internal/misc/Unsafe.unpark(Ljava/lang/Object;)V":
remove( instructions, idx, callInst, 2 );
break;
default:
throw new WasmException( "Unsupported Unsafe method: " + name.signatureName, -1 );
@ -495,9 +502,28 @@ class UnsafeManager {
* @param callInst
* the method call to Unsafe
*/
private void remove( List<WasmInstruction> instructions, int idx, final WasmCallInstruction callInst ) {
private void replaceWithConstNumber( List<WasmInstruction> instructions, int idx, final WasmCallInstruction callInst, int paramCount, int number ) {
int from = StackInspector.findInstructionThatPushValue( instructions.subList( 0, idx ), 1, callInst.getCodePosition() ).idx;
nop( instructions, from, idx );
// on x86 use little endian
instructions.set( idx, new WasmConstNumberInstruction( number, callInst.getCodePosition(), callInst.getLineNumber() ) );
}
/**
* Patch an unsafe function that access a field
*
* @param instructions
* the instruction list
* @param idx
* the index in the instructions
* @param callInst
* the method call to Unsafe
*/
private void remove( List<WasmInstruction> instructions, int idx, final WasmCallInstruction callInst, int paramCount ) {
int from = StackInspector.findInstructionThatPushValue( instructions.subList( 0, idx ), paramCount, callInst.getCodePosition() ).idx;
nop( instructions, from, idx + 1 );
}

8
src/de/inetsoftware/jwebassembly/module/nativecode/ReplacementForClass.java
View File

@ -335,6 +335,14 @@ class ReplacementForClass<T> {
return null;
}
/**
* Get the declaring class
* @return the declaring class for this class
*/
private Class<?> getDeclaringClass0() {
return null;
}
/**
* Replacement of the Java method getSimpleName()
*