Improved the way code is decoded by avoiding to propagate the base address everywhere.

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

3 files changed, 14 insertions, 14 deletions

diff --git a/src/arch/dalvik/operands/pool.c b/src/arch/dalvik/operands/pool.c
index 1e69a18..2c1f653 100644
--- a/src/arch/dalvik/operands/pool.c
+++ b/src/arch/dalvik/operands/pool.c
@@ -118,7 +118,7 @@ static void g_dalvik_pool_operand_init(GDalvikPoolOperand *operand)
 *                type   = type de table visée avec la référence.              *
 *                data   = flux de données à analyser.                         *
 *                pos    = position courante dans ce flux. [OUT]               *
-*                len    = taille totale des données à analyser.               *
+*                end    = limite des données à analyser.                      *
 *                size   = taille de l'opérande, et donc du registre.          *
 *                endian = ordre des bits dans la source.                      *
 *                                                                             *
@@ -130,7 +130,7 @@ static void g_dalvik_pool_operand_init(GDalvikPoolOperand *operand)
 *                                                                             *
 ******************************************************************************/
 
-GArchOperand *g_dalvik_pool_operand_new(const GDexFormat *format, DalvikPoolType type, const bin_t *data, off_t *pos, off_t len, MemoryDataSize size, SourceEndian endian)
+GArchOperand *g_dalvik_pool_operand_new(const GDexFormat *format, DalvikPoolType type, const bin_t *data, off_t *pos, off_t end, MemoryDataSize size, SourceEndian endian)
 {
     GDalvikPoolOperand *result;             /* Structure à retourner       */
     uint8_t index8;                         /* Indice sur 8 bits           */
@@ -140,10 +140,10 @@ GArchOperand *g_dalvik_pool_operand_new(const GDexFormat *format, DalvikPoolType
     switch (size)
     {
         case MDS_8_BITS:
-            test = read_u8(&index8, data, pos, len, endian);
+            test = read_u8(&index8, data, pos, end, endian);
             break;
         case MDS_16_BITS:
-            test = read_u16(&index16, data, pos, len, endian);
+            test = read_u16(&index16, data, pos, end, endian);
             break;
         default:
             test = false;
diff --git a/src/arch/dalvik/operands/register.c b/src/arch/dalvik/operands/register.c
index 45e965c..00d5699 100644
--- a/src/arch/dalvik/operands/register.c
+++ b/src/arch/dalvik/operands/register.c
@@ -113,7 +113,7 @@ static void g_dalvik_register_operand_init(GDalvikRegisterOperand *operand)
 *                                                                             *
 *  Paramètres  : data   = flux de données à analyser.                         *
 *                pos    = position courante dans ce flux. [OUT]               *
-*                len    = taille totale des données à analyser.               *
+*                end    = limite des données à analyser.                      *
 *                low    = position éventuelle des 4 bits visés. [OUT]         *
 *                size   = taille de l'opérande, et donc du registre.          *
 *                endian = ordre des bits dans la source.                      *
@@ -126,7 +126,7 @@ static void g_dalvik_register_operand_init(GDalvikRegisterOperand *operand)
 *                                                                             *
 ******************************************************************************/
 
-GArchOperand *g_dalvik_register_operand_new(const bin_t *data, off_t *pos, off_t len, bool *low, MemoryDataSize size, SourceEndian endian)
+GArchOperand *g_dalvik_register_operand_new(const bin_t *data, off_t *pos, off_t end, bool *low, MemoryDataSize size, SourceEndian endian)
 {
     GDalvikRegisterOperand *result;         /* Structure à retourner       */
     uint8_t index8;                         /* Indice sur 8 bits           */
@@ -136,13 +136,13 @@ GArchOperand *g_dalvik_register_operand_new(const bin_t *data, off_t *pos, off_t
     switch (size)
     {
         case MDS_4_BITS:
-            test = read_u4(&index8, data, pos, len, low, endian);
+            test = read_u4(&index8, data, pos, end, low, endian);
             break;
         case MDS_8_BITS:
-            test = read_u8(&index8, data, pos, len, endian);
+            test = read_u8(&index8, data, pos, end, endian);
             break;
         case MDS_16_BITS:
-            test = read_u16(&index16, data, pos, len, endian);
+            test = read_u16(&index16, data, pos, end, endian);
             break;
         default:
             test = false;
diff --git a/src/arch/dalvik/operands/target.c b/src/arch/dalvik/operands/target.c
index 6fe4df4..f53bb7b 100644
--- a/src/arch/dalvik/operands/target.c
+++ b/src/arch/dalvik/operands/target.c
@@ -106,7 +106,7 @@ static void g_dalvik_target_operand_init(GDalvikTargetOperand *operand)
 *                                                                             *
 *  Paramètres  : data   = flux de données à analyser.                         *
 *                pos    = position courante dans ce flux. [OUT]               *
-*                len    = taille totale des données à analyser.               *
+*                end    = limite des données à analyser.                      *
 *                size   = taille de l'opérande.                               *
 *                endian = ordre des bits dans la source.                      *
 *                base   = adresse de référence pour le calcul.                *
@@ -119,7 +119,7 @@ static void g_dalvik_target_operand_init(GDalvikTargetOperand *operand)
 *                                                                             *
 ******************************************************************************/
 
-GArchOperand *g_dalvik_target_operand_new(const bin_t *data, off_t *pos, off_t len, MemoryDataSize size, SourceEndian endian, vmpa_t base)
+GArchOperand *g_dalvik_target_operand_new(const bin_t *data, off_t *pos, off_t end, MemoryDataSize size, SourceEndian endian, vmpa_t base)
 {
     GDalvikTargetOperand *result;           /* Structure à retourner       */
     int8_t val8;                            /* Valeur sur 8 bits           */
@@ -130,15 +130,15 @@ GArchOperand *g_dalvik_target_operand_new(const bin_t *data, off_t *pos, off_t l
     switch (size)
     {
         case MDS_8_BITS_SIGNED:
-            read_s8(&val8, data, pos, len, endian);
+            read_s8(&val8, data, pos, end, endian);
             address = base + val8 * sizeof(uint16_t);
             break;
         case MDS_16_BITS_SIGNED:
-            read_s16(&val16, data, pos, len, endian);
+            read_s16(&val16, data, pos, end, endian);
             address = base + val16 * sizeof(uint16_t);
             break;
         case MDS_32_BITS_SIGNED:
-            read_s32(&val32, data, pos, len, endian);
+            read_s32(&val32, data, pos, end, endian);
             address = base + val32 * sizeof(uint16_t);
             break;
         default: