eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

C: fix Strings.fromC/fromC16 methods

Browse Source
This commit is contained in:
Alexey Andreev 2020-01-30 15:41:37 +03:00
parent 2285254aa4
commit f13a7e6375
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/teavm/backend/c/CTarget.java
View File

@ -75,6 +75,7 @@ import org.teavm.backend.c.intrinsic.StringsIntrinsic;
import org.teavm.backend.c.intrinsic.StructureIntrinsic;
import org.teavm.backend.lowlevel.analyze.LowLevelInliningFilterFactory;
import org.teavm.backend.lowlevel.dependency.ExceptionHandlingDependencyListener;
import org.teavm.backend.lowlevel.dependency.StringsDependencyListener;
import org.teavm.backend.lowlevel.dependency.WeakReferenceDependencyListener;
import org.teavm.backend.lowlevel.generate.NameProvider;
import org.teavm.backend.lowlevel.generate.NameProviderWithSpecialNames;
@ -324,6 +325,7 @@ public class CTarget implements TeaVMTarget, TeaVMCHost {
dependencyAnalyzer.linkClass(CallSiteLocation.class.getName());
dependencyAnalyzer.addDependencyListener(new ExceptionHandlingDependencyListener());
dependencyAnalyzer.addDependencyListener(new StringsDependencyListener());
}
@Override

37
core/src/main/java/org/teavm/backend/lowlevel/dependency/StringsDependencyListener.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright 2020 konsoletyper.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.backend.lowlevel.dependency;
import org.teavm.dependency.AbstractDependencyListener;
import org.teavm.dependency.DependencyAgent;
import org.teavm.dependency.MethodDependency;
import org.teavm.model.MethodReference;
public class StringsDependencyListener extends AbstractDependencyListener {
private static final String STRINGS_CLASS = "org.teavm.interop.Strings";
@Override
public void methodReached(DependencyAgent agent, MethodDependency method) {
MethodReference ref = method.getReference();
if (ref.getClassName().equals(STRINGS_CLASS)) {
switch (ref.getName()) {
case "fromC":
case "fromC16":
method.getResult().propagate(agent.getType("java.lang.String"));
}
}
}
}

3
core/src/main/java/org/teavm/backend/wasm/WasmTarget.java
View File

@ -32,6 +32,7 @@ import java.util.Properties;
import java.util.Set;
import org.teavm.ast.decompilation.Decompiler;
import org.teavm.backend.lowlevel.analyze.LowLevelInliningFilterFactory;
import org.teavm.backend.lowlevel.dependency.StringsDependencyListener;
import org.teavm.backend.lowlevel.generate.NameProvider;
import org.teavm.backend.lowlevel.generate.NameProviderWithSpecialNames;
import org.teavm.backend.wasm.binary.BinaryWriter;
@ -330,6 +331,8 @@ public class WasmTarget implements TeaVMTarget, TeaVMWasmHost {
dependencyAnalyzer.linkField(field.getReference());
}
}
dependencyAnalyzer.addDependencyListener(new StringsDependencyListener());
}
@Override