From 1043d01b8ab0d2ceec4a6c8ae8298c1921601b6a Mon Sep 17 00:00:00 2001 From: Humberto Silva Naves Date: Tue, 22 Jul 2008 12:02:06 -0300 Subject: [PATCH] Agora a build dos arquivos jasmin esta integrada ao maven --- build.xml | 13 --- lib/jasmin-2.3.jar | Bin 128772 -> 128819 bytes pom.xml | 123 ++++++++++++++------- .../disassembler/JasminDisassembler.java | 2 +- .../disassembler/JasminDisassemblerTest.java | 9 ++ 5 files changed, 90 insertions(+), 57 deletions(-) delete mode 100644 build.xml rewrite pom.xml (99%) diff --git a/build.xml b/build.xml deleted file mode 100644 index 558b39d..0000000 --- a/build.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/jasmin-2.3.jar b/lib/jasmin-2.3.jar index a8eb49066e514de45fa143f2ec15c9a7846d2ba9..e3161ed2c63e9ac8b63b05382dc0c976de510760 100644 GIT binary patch delta 3307 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 - 4.0.0 - br.org.javadecompiler - javadecompiler - 1.0.0-SNAPSHOT - jar - Java Decompiler - Java Decompiler - 2008 - - - - log4j - log4j - 1.2.13 - compile - - - junit - junit - 3.8.1 - test - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - classes/** - - - - - - - - \ No newline at end of file + + 4.0.0 + br.org.javadecompiler + javadecompiler + 1.0.0-SNAPSHOT + jar + Java Decompiler + Java Decompiler + 2008 + + + log4j + log4j + 1.2.13 + compile + + + junit + junit + 3.8.1 + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + classes/** + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-test-classes + generate-test-resources + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + ant-contrib + ant-contrib + 1.0b2 + + + + + + diff --git a/src/main/java/br/org/javadecompiler/disassembler/JasminDisassembler.java b/src/main/java/br/org/javadecompiler/disassembler/JasminDisassembler.java index 82919d6..51e56a9 100644 --- a/src/main/java/br/org/javadecompiler/disassembler/JasminDisassembler.java +++ b/src/main/java/br/org/javadecompiler/disassembler/JasminDisassembler.java @@ -238,7 +238,7 @@ public class JasminDisassembler { bc = codeAttribute.getByteCode(pos++); format = BytecodeInstructions.byteCodeFormat[bc]; if (format == BytecodeInstructions.FORMAT_INVALID) { - throw new RuntimeException("Invalid bytecode"); + //throw new RuntimeException("Invalid bytecode"); } else if (format == BytecodeInstructions.FORMAT_WIDE) { } else { diff --git a/src/test/java/br/org/javadecompiler/disassembler/JasminDisassemblerTest.java b/src/test/java/br/org/javadecompiler/disassembler/JasminDisassemblerTest.java index 08ec9c5..22f0d5b 100644 --- a/src/test/java/br/org/javadecompiler/disassembler/JasminDisassemblerTest.java +++ b/src/test/java/br/org/javadecompiler/disassembler/JasminDisassemblerTest.java @@ -1,7 +1,9 @@ package br.org.javadecompiler.disassembler; import br.org.javadecompiler.classfile.JavaClass; +import br.org.javadecompiler.decoder.Decoder; import br.org.javadecompiler.decoder.DecoderTest; +import br.org.javadecompiler.reader.DefaultClassReader; import junit.framework.TestCase; public class JasminDisassemblerTest extends TestCase { @@ -14,4 +16,11 @@ public class JasminDisassemblerTest extends TestCase { JasminDisassembler disassembler = new JasminDisassembler(); System.out.println(disassembler.disassembleClass(clazz)); } + + public void testDisassembleClassTestFields() throws Exception { + JavaClass clazz = Decoder.decodeClass(DefaultClassReader.getFromInputStream(getClass().getResourceAsStream("/classes/TestFields.class"))); + JasminDisassembler disassembler = new JasminDisassembler(); + System.out.println(disassembler.disassembleClass(clazz)); + } + } -- 2.11.4.GIT