-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bring back asm bridge #601
Merged
Merged
+113
−11
Commits on Sep 1, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 2b7df12 - Browse repository at this point
Copy the full SHA 2b7df12View commit details -
# Conflicts: # d2j-j6/build.gradle # d2j-jasmin/build.gradle # d2j-smali/build.gradle # d2j-smali/src/main/antlr4/com/googlecode/d2j/smali/antlr4/Smali.g4 # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InvocationWeaver.java # dex-translator/build.gradle
Configuration menu - View commit details
-
Copy full SHA for 7db66b9 - Browse repository at this point
Copy the full SHA 7db66b9View commit details -
Most of these are from some fork # Conflicts: # build.gradle # d2j-j6/build.gradle # d2j-jasmin/build.gradle # d2j-smali/build.gradle # d2j-smali/src/test/java/a/SmaliTest.java # dex-reader-api/src/main/java/com/googlecode/d2j/DexConstants.java # dex-reader/build.gradle # dex-reader/src/main/java/com/googlecode/d2j/reader/DexFileReader.java # dex-tools/build.gradle # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InitOut.java # dex-translator/build.gradle # dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2Asm.java # gradle/wrapper/gradle-wrapper.properties
Configuration menu - View commit details
-
Copy full SHA for a91d678 - Browse repository at this point
Copy the full SHA a91d678View commit details -
# Conflicts: # .hgignore # README.md # build.gradle # d2j-j6/README.md # d2j-j6/build.gradle # d2j-j6/src/main/java/j6/Files.java # d2j-j6/src/main/java/j6/Thro.java # d2j-j6/src/main/java/pxb/java/nio/file/FileVisitResult.java # d2j-j6/src/main/java/pxb/java/nio/file/FileVisitor.java # d2j-j6/src/main/java/pxb/java/nio/file/Files.java # d2j-j6/src/main/java/pxb/java/nio/file/SimpleFileVisitor.java # d2j-j6/src/main/java/pxb/java/nio/file/spi/FileSystemProvider.java # d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/JasminDumper.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/AntlrSmaliUtil.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/BaksmaliCodeDumper.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/Smali.java # d2j-smali/src/test/java/a/SmaliTest.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/Exprs.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/InvokeCustomExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/VoidInvokeStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/UnSSATransformer.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/analysis/DvmFrame.java # dex-reader-api/src/main/java/com/googlecode/d2j/visitors/DexCodeVisitor.java # dex-reader/src/main/java/com/googlecode/d2j/reader/DexFileReader.java # dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierCodeV.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InitOut.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InvocationWeaver.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/ScanBridgeAdapter.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/BaksmaliBaseDexExceptionHandler.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/GenerateCompileStubFromOdex.java # dex-tools/src/test/java/com/googlecode/d2j/tools/jar/test/WaveTest.java # dex-translator/src/main/java/com/googlecode/d2j/converter/Dex2IRConverter.java # dex-translator/src/main/java/com/googlecode/d2j/converter/IR2JConverter.java # dex-translator/src/main/java/com/googlecode/d2j/converter/J2IRConverter.java # dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2Asm.java # dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2jar.java # dex-translator/src/main/java/com/googlecode/d2j/dex/ExDex2Asm.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/ArrayTypeTest.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/TestUtils.java # dex-writer/build.gradle # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/CodeWriter.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/ev/EncodedValue.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/ConstPool.java # gradle/wrapper/gradle-wrapper.properties # settings.gradle
Configuration menu - View commit details
-
Copy full SHA for 452a3f4 - Browse repository at this point
Copy the full SHA 452a3f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a0d813 - Browse repository at this point
Copy the full SHA 0a0d813View commit details -
Reformat code based on CheckStyle
No, I won't add the CheckStyle plugin for Gradle... It just needs to long to check all files # Conflicts: # d2j-base-cmd/src/main/java/com/googlecode/dex2jar/tools/BaseCmd.java # d2j-base-cmd/src/main/java/com/googlecode/dex2jar/tools/Constants.java # d2j-j6/src/main/java/j6/Files.java # d2j-j6/src/main/java/j6/Thro.java # d2j-j6/src/main/java/pxb/java/nio/charset/StandardCharsets.java # d2j-j6/src/main/java/pxb/java/nio/file/FileSystem.java # d2j-j6/src/main/java/pxb/java/nio/file/FileVisitResult.java # d2j-j6/src/main/java/pxb/java/nio/file/FileVisitor.java # d2j-j6/src/main/java/pxb/java/nio/file/Files.java # d2j-j6/src/main/java/pxb/java/nio/file/Path.java # d2j-j6/src/main/java/pxb/java/nio/file/SimpleFileVisitor.java # d2j-j6/src/main/java/pxb/java/nio/file/spi/FileSystemProvider.java # d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jar2JasminCmd.java # d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jasmin2JarCmd.java # d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/JasminDumper.java # d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jasmins.java # d2j-jasmin/src/test/java/com/googlecode/d2j/tools/jar/test/Jasmin2jTest.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/AntlrSmaliUtil.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/Baksmali.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/BaksmaliCmd.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/BaksmaliCodeDumper.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/BaksmaliDumper.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/Smali.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/SmaliCmd.java # d2j-smali/src/main/java/com/googlecode/d2j/smali/SmaliCodeVisitor.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ET.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/IrMethod.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/StmtSearcher.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/StmtTraveler.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/Trap.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/TypeClass.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/Util.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/AbstractInvokeExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/ArrayExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/BinopExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/CastExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/Constant.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/Exprs.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/FieldExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/FilledArrayExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/InvokeCustomExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/InvokeExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/InvokePolymorphicExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/Local.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/NewExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/NewMutiArrayExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/PhiExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/RefExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/StaticFieldExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/TypeExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/UnopExpr.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/expr/Value.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/AssignStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/BaseSwitchStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/GotoStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/IfStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/JumpStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/LabelStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/LookupSwitchStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/NopStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/ReturnVoidStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/Stmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/StmtList.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/Stmts.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/TableSwitchStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/UnopStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/stmt/VoidInvokeStmt.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/AggTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/Cfg.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/CleanLabel.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/ConstTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/DeadCodeTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/EndRemover.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/ExceptionHandlerTrim.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/FixVar.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/Ir2JRegAssignTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/JimpleTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/NpeTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/RemoveConstantFromSSA.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/SSATransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/Transformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/TypeTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/UnSSATransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/VoidInvokeTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/ZeroTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/an/AnalyzeValue.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/an/BaseAnalyze.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/an/SimpleLiveAnalyze.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/an/SimpleLiveValue.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/array/ArrayElementTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/array/ArrayNullPointerTransformer.java # dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/array/FillArrayTransformer.java # dex-reader-api/src/main/java/com/googlecode/d2j/DexConstants.java # dex-reader-api/src/main/java/com/googlecode/d2j/DexException.java # dex-reader-api/src/main/java/com/googlecode/d2j/DexLabel.java # dex-reader-api/src/main/java/com/googlecode/d2j/DexType.java # dex-reader-api/src/main/java/com/googlecode/d2j/Field.java # dex-reader-api/src/main/java/com/googlecode/d2j/Method.java # dex-reader-api/src/main/java/com/googlecode/d2j/Visibility.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/DexAnnotationNode.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/DexClassNode.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/DexCodeNode.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/DexFieldNode.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/DexMethodNode.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/insn/MethodCustomStmtNode.java # dex-reader-api/src/main/java/com/googlecode/d2j/node/insn/PackedSwitchStmtNode.java # dex-reader-api/src/main/java/com/googlecode/d2j/reader/CFG.java # dex-reader-api/src/main/java/com/googlecode/d2j/reader/InstructionFormat.java # dex-reader-api/src/main/java/com/googlecode/d2j/reader/InstructionIndexType.java # dex-reader-api/src/main/java/com/googlecode/d2j/reader/Op.java # dex-reader-api/src/main/java/com/googlecode/d2j/visitors/DexAnnotationAble.java # dex-reader-api/src/main/java/com/googlecode/d2j/visitors/DexAnnotationVisitor.java # dex-reader-api/src/main/java/com/googlecode/d2j/visitors/DexClassVisitor.java # dex-reader-api/src/main/java/com/googlecode/d2j/visitors/DexCodeVisitor.java # dex-reader-api/src/main/java/com/googlecode/d2j/visitors/DexFileVisitor.java # dex-reader-api/src/main/java/com/googlecode/d2j/visitors/DexMethodVisitor.java # dex-reader/src/main/java/com/googlecode/d2j/reader/DexFileReader.java # dex-reader/src/main/java/com/googlecode/d2j/reader/MultiDexFileReader.java # dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierAnnotationV.java # dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierClassV.java # dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierCodeV.java # dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierFileV.java # dex-reader/src/main/java/com/googlecode/d2j/util/ArrayOut.java # dex-reader/src/main/java/com/googlecode/d2j/util/Escape.java # dex-reader/src/main/java/com/googlecode/d2j/util/zip/ZipConstants.java # dex-reader/src/main/java/com/googlecode/d2j/util/zip/ZipEntry.java # dex-reader/src/main/java/com/googlecode/d2j/util/zip/ZipFile.java # dex-tools/src/main/java/com/googlecode/d2j/signapk/AbstractJarSign.java # dex-tools/src/main/java/com/googlecode/d2j/signapk/Base64.java # dex-tools/src/main/java/com/googlecode/d2j/signapk/TinySignImpl.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/BaseWeaver.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/ClassInfo.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/DexWeaver.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InitOut.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InvocationWeaver.java # dex-tools/src/main/java/com/googlecode/d2j/tools/jar/ScanBridgeAdapter.java # dex-tools/src/main/java/com/googlecode/dex2jar/bin_gen/BinGen.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/ApkSign.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/AsmVerify.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/BaksmaliBaseDexExceptionHandler.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/ClassVersionSwitch.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/DeObfInitCmd.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/DecryptStringCmd.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/Dex2jarCmd.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/Dex2jarMultiThreadCmd.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/DexRecomputeChecksum.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/DexWeaverCmd.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/ExtractOdexFromCoredumpCmd.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/Jar2Dex.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/JarAccessCmd.java # dex-tools/src/main/java/com/googlecode/dex2jar/tools/StdApkCmd.java # dex-translator/src/main/java/com/googlecode/d2j/asm/LdcOptimizeAdapter.java # dex-translator/src/main/java/com/googlecode/d2j/converter/Dex2IRConverter.java # dex-translator/src/main/java/com/googlecode/d2j/converter/IR2JConverter.java # dex-translator/src/main/java/com/googlecode/d2j/converter/J2IRConverter.java # dex-translator/src/main/java/com/googlecode/d2j/dex/BaseDexExceptionHandler.java # dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2Asm.java # dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2IrAdapter.java # dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2jar.java # dex-translator/src/main/java/com/googlecode/d2j/dex/DexExceptionHandler.java # dex-translator/src/main/java/com/googlecode/d2j/dex/DexFix.java # dex-translator/src/main/java/com/googlecode/d2j/dex/V3.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/ASMifierTest.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/D2jTest.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/Issue71Test.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/ResTest.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/Smali2jTest.java # dex-translator/src/test/java/com/googlecode/dex2jar/test/TestUtils.java # dex-translator/src/test/java/dex2jar/gen/FTPClient__parsePassiveModeReply.java # dex-translator/src/test/java/res/ArrayRes.java # dex-translator/src/test/java/res/ChineseRes.java # dex-translator/src/test/java/res/ExceptionRes.java # dex-translator/src/test/java/res/I56_AccessFlag.java # dex-translator/src/test/java/res/LongDoubleRes.java # dex-translator/src/test/java/res/NullZero.java # dex-translator/src/test/java/res/PopRes.java # dex-translator/src/test/java/res/SwitchRes.java # dex-translator/src/test/java/res/WideRes.java # dex-translator/src/test/java/res/i55/AAbstractClass.java # dex-translator/src/test/java/res/i55/AClass.java # dex-translator/src/test/java/res/i55/AInterface.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/CodeWriter.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/DexFileWriter.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/ev/EncodedAnnotation.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/ev/EncodedArray.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/ev/EncodedValue.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/insn/JumpOp.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/insn/OpInsn.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/AnnotationSetItem.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/CodeItem.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/ConstPool.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/DebugInfoItem.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/EncodedArrayItem.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/HeadItem.java # dex-writer/src/main/java/com/googlecode/d2j/dex/writer/item/SectionItem.java
Configuration menu - View commit details
-
Copy full SHA for 91492a8 - Browse repository at this point
Copy the full SHA 91492a8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3dfdee7 - Browse repository at this point
Copy the full SHA 3dfdee7View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.