Reorganized the Dalvik architecture.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@219 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 158 insertions, 0 deletions

diff --git a/src/arch/dalvik/decomp/invoke.c b/src/arch/dalvik/decomp/invoke.c
new file mode 100644
index 0000000..6a542f3
--- /dev/null
+++ b/src/arch/dalvik/decomp/invoke.c
@@ -0,0 +1,158 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * invoke.c - décompilation des appels de méthode
+ *
+ * Copyright (C) 2010 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA 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.
+ *
+ *  OpenIDA 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "translate.h"
+
+
+#include "../instruction.h"
+#include "../operand.h"
+#include "../../../decomp/expr/assign.h"
+#include "../../../decomp/expr/call.h"
+#include "../../../format/dex/pool.h"
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : instr = instruction d'origine à convertir.                   *
+*                ctx   = contexte de la phase de décompilation.               *
+*                                                                             *
+*  Description : Décompile une instruction de type 'invoke-virtual'.          *
+*                                                                             *
+*  Retour      : Instruction mise en place ou NULL.                           *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+GDecInstruction *dalvik_decomp_instr_invoke_virtual(const GArchInstruction *instr, GDecContext *ctx)
+{
+    GDecInstruction *result;                /* Instruction à retourner     */
+
+
+    size_t count;                           /* Quantité d'opérandes        */
+    GArchOperand *op;                       /* Opérande de l'instruction   */
+    uint32_t index;                         /* Indice de l'élément visé    */
+    GDexFormat *format;                     /* Accès aux constantes        */
+    GBinRoutine *routine;                   /* Routine visée par l'appel   */
+
+    const char *string;                     /* Chaîne à afficher           */
+    GOpenidaType *type;                     /* Type quelconque             */
+    char *tmp;                              /* Chaîne à afficher & libérer */
+
+
+
+    GArchOperand *operand;                  /* Opérande de l'instruction   */
+    GDecInstruction *reg;                   /* Pseudo-registre redéfini    */
+    GDecInstruction *imm;                   /* Valeur immédiate décompilée */
+
+    GArchInstruction *iter;                 /* Boucle de parcours          */
+    vmpa_t max;                             /* Limite à ne pas dépasser    */
+
+
+    result = NULL;
+
+
+    printf("PAssaage !\n");
+
+
+
+
+
+
+    /* Récupération de la méthode */
+
+    count = g_arch_instruction_count_operands(instr);
+    op = g_arch_instruction_get_operand(instr, count - 1);
+
+    index = g_dalvik_pool_operand_get_index(G_DALVIK_POOL_OPERAND(op));
+
+    printf("POOL ?? %d -> %d\n", G_IS_DALVIK_POOL_OPERAND(op), index);
+
+    format = G_DEX_FORMAT(g_object_get_data(G_OBJECT(ctx), "format"));
+    routine = get_routine_from_dex_pool(format, index);
+    if (routine == NULL) return NULL;
+
+
+#if 0
+            if (operand->cache.method == NULL)
+                g_content_exporter_insert_into_buffer(exporter, buffer, BLC_ASSEMBLY,
+                                                      "<bad_method_index>", 18, RTT_VAR_NAME);
+
+            else
+            {
+                tmp = g_binary_routine_to_string(operand->cache.method);
+
+                g_content_exporter_insert_into_buffer(exporter, buffer, BLC_ASSEMBLY,
+                                                      tmp, strlen(tmp), RTT_VAR_NAME);
+
+                free(tmp);
+
+
+#endif
+
+    result = g_routine_call_new(routine, true);
+
+        //GDecInstruction *g_routine_call_new(GBinRoutine *routine, bool is_object)
+    /*
+    operand = g_arch_instruction_get_operand(instr, 1);
+    reg = g_dec_context_convert_register(ctx, operand);
+
+    operand = g_arch_instruction_get_operand(instr, 1);
+    imm = g_imm_expression_new(G_IMM_OPERAND(operand));
+
+    result = g_assign_expression_new(G_DEC_EXPRESSION(reg), G_DEC_EXPRESSION(imm));
+    */
+
+
+
+
+
+    /* Récupération d'un résultat ? */
+
+    iter = instr;
+    max = g_dec_context_get_max_address(ctx);
+
+    iter = g_arch_instruction_get_next_iter(instr, iter, max);
+
+    if (iter != NULL)
+        switch (g_dalvik_instruction_get_opcode(G_DALVIK_INSTRUCTION(iter)))
+        {
+            case DOP_MOVE_RESULT:
+
+                operand = g_arch_instruction_get_operand(iter, 0);
+                reg = g_dec_context_convert_register(ctx, operand);
+
+                result = g_assign_expression_new(G_DEC_EXPRESSION(reg), G_DEC_EXPRESSION(result));
+
+                break;
+
+            default:
+                break;
+
+        }
+
+    return result;
+
+}