changeset 113:4dfa6db13f7c

merge
author forax
date Fri, 01 Apr 2011 23:52:15 +0200
parents d29d8ebc2c1a (diff) b4b1ddad8f7b (current diff)
children 63f4cff176e1
files src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java
diffstat 4 files changed, 72 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/org/icedrobot/daneel/loader/Verifier.java	Fri Apr 01 20:21:13 2011 +0200
+++ b/src/main/java/org/icedrobot/daneel/loader/Verifier.java	Fri Apr 01 23:52:15 2011 +0200
@@ -95,6 +95,7 @@
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TryCatchBlockNode;
 import org.objectweb.asm.tree.analysis.Analyzer;
+import org.objectweb.asm.tree.analysis.BasicVerifier;
 import org.objectweb.asm.tree.analysis.Frame;
 import org.objectweb.asm.tree.analysis.SimpleVerifier;
 import org.objectweb.asm.util.CheckClassAdapter;
@@ -122,13 +123,14 @@
         String internalName = node.name;
         for (int i = 0; i < methods.size(); i++) {
             MethodNode method = methods.get(i);
-            SimpleVerifier verifier = new SimpleVerifier(
+            /*SimpleVerifier verifier = new SimpleVerifier(
                     Type.getObjectType(internalName),
                     superType,
                     Arrays.asList(interfazes),
-                    (node.access & ~Opcodes.ACC_INTERFACE) != 0);
+                    (node.access & ~Opcodes.ACC_INTERFACE) != 0);*/
+            BasicVerifier verifier = new BasicVerifier();
             Analyzer analyzer = new Analyzer(verifier);
-            verifier.setClassLoader(classloader);
+            //verifier.setClassLoader(classloader);
 
             try {
                 analyzer.analyze(internalName, method);
--- a/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Fri Apr 01 20:21:13 2011 +0200
+++ b/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Fri Apr 01 23:52:15 2011 +0200
@@ -527,7 +527,7 @@
                 r += asmType.getSize();
             }
 
-            owner = TypeUtil.convertDescToInternal(owner);
+            owner = Type.getType(owner).getInternalName();
             mv.visitMethodInsn(javaOpcode, owner, name, desc);
             returnRegisterType = getReturnTypeFromMethodDescriptor(desc);
             return;
--- a/src/main/java/org/icedrobot/daneel/rewriter/Register.java	Fri Apr 01 20:21:13 2011 +0200
+++ b/src/main/java/org/icedrobot/daneel/rewriter/Register.java	Fri Apr 01 23:52:15 2011 +0200
@@ -321,6 +321,14 @@
             return "long";
         case DOUBLE_TYPE:
             return "double";
+        case BOOLEAN_TYPE:
+            return "bool";
+        case BYTE_TYPE:
+            return "byte";
+        case SHORT_TYPE:
+            return "short";
+        case CHAR_TYPE:
+            return "char";
         case U32_TYPE:
             return "u32";
         case U64_TYPE:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/test/java/org/icedrobot/daneel/rewriter/ArrayMethodCall.java	Fri Apr 01 23:52:15 2011 +0200
@@ -0,0 +1,58 @@
+/*
+ * Daneel - Dalvik to Java bytecode compiler
+ * Copyright (C) 2011  IcedRobot team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * This file is subject to the "Classpath" exception:
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under terms
+ * of your choice, provided that you also meet, for each linked independent
+ * module, the terms and conditions of the license of that module.  An
+ * independent module is a module which is not derived from or based on
+ * this library.  If you modify this library, you may extend this exception
+ * to your version of the library, but you are not obligated to do so.  If
+ * you do not wish to do so, delete this exception statement from your
+ * version.
+ */
+
+package org.icedrobot.daneel.rewriter;
+
+import org.icedrobot.daneel.DexifyingRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(DexifyingRunner.class)
+public class ArrayMethodCall {
+
+    @Test
+    public void testArrayMethodCall() {
+        DEXCode.m(new String[]{ "foo" });
+    }
+
+    // Keep this class named "DEXCode" to push it through Daneel.
+    private static class DEXCode {
+        public static void m(String[] args) {
+            args = args.clone();
+        }
+    }
+}