ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-patcher.git synced 2026-01-18 17:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dalvik-patcher' into dalvik-patcher

Browse Source
This commit is contained in:
oSumAtrIX
2022-05-07 05:07:35 +02:00
parent e5c054ac2f cb0741d05f
commit e286ba5090
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -9,7 +9,7 @@ group = "app.revanced"
repositories {
mavenCentral()
maven {
url = uri("https://maven.pkg.github.com/ReVancedTeam/multidexlib2")
url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
credentials {
// DO NOT set these variables in the project's gradle.properties.
// Instead, you should set them in:
@@ -52,7 +52,7 @@ publishing {
if (isGitHubCI) {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/ReVancedTeam/revanced-patcher")
url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")

13
src/main/kotlin/app/revanced/patcher/smali/InlineSmaliCompiler.kt
View File

@@ -15,8 +15,8 @@ import java.io.InputStreamReader
private const val METHOD_TEMPLATE = """
.class public Linlinecompiler;
.super Ljava/lang/Object;
.method public static compiler()V
.registers 1
.method public static compiler(%s)V
.registers %d
%s
.end method
"""
@@ -25,14 +25,15 @@ class InlineSmaliCompiler {
companion object {
/**
* Compiles a string of Smali code to a list of instructions.
* p0, p1 etc. will only work correctly if the parameters and registers are passed.
* Do not cross the boundaries of the control flow (if-nez insn, etc),
* as that will result in exceptions since the labels cannot be calculated.
* Do not create dummy labels to fix the issue, since the code addresses will
* be messed up and results in broken Dalvik bytecode.
* FIXME: Fix the above issue. When this is fixed, add the proper conversions in [InstructionConverter].
*/
fun compileMethodInstructions(instructions: String): List<BuilderInstruction> {
val input = METHOD_TEMPLATE.format(instructions)
fun compileMethodInstructions(instructions: String, parameters: String, registers: Int): List<BuilderInstruction> {
val input = METHOD_TEMPLATE.format(parameters, registers, instructions)
val reader = InputStreamReader(input.byteInputStream())
val lexer: LexerErrorInterface = smaliFlexLexer(reader, 15)
val tokens = CommonTokenStream(lexer as TokenSource)
@@ -53,5 +54,5 @@ class InlineSmaliCompiler {
}
}
fun String.toInstructions() = InlineSmaliCompiler.compileMethodInstructions(this)
fun String.toInstruction() = this.toInstructions().first()
fun String.toInstructions(parameters: String = "", registers: Int = 1) = InlineSmaliCompiler.compileMethodInstructions(this, parameters, registers)
fun String.toInstruction(parameters: String = "", registers: Int = 1) = this.toInstructions(parameters, registers).first()