Parsed and replaced ModRM operands.

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

2 files changed, 68 insertions, 3 deletions

diff --git a/src/arch/immediate.c b/src/arch/immediate.c
index 54d8135..73a7648 100644
--- a/src/arch/immediate.c
+++ b/src/arch/immediate.c
@@ -313,8 +313,6 @@ bool g_imm_operand_is_negative(const GImmOperand *operand)
 {
     bool result;                            /* Bilan à renvoyer            */
 
-    result = false;
-
     switch (operand->size)
     {
         case AOS_8_BITS_SIGNED:
@@ -330,7 +328,7 @@ bool g_imm_operand_is_negative(const GImmOperand *operand)
             result = (operand->signed_imm.val64 & 0x8000000000000000ll);
             break;
         default:
-            /* Traitement non nécessaire */
+            result = false;
             break;
     }
 
@@ -561,3 +559,67 @@ bool g_imm_operand_to_vmpa_t(const GImmOperand *operand, vmpa_t *addr)
     return result;
 
 }
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : operand  = opérande à traiter.                               *
+*                value    = valeur résultante. [OUT]                          *
+*                negative = indique si la valeur était négative à l'origine.  *
+*                                                                             *
+*  Description : Convertit une valeur immédiate en valeur de type size_t.     *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool g_imm_operand_to_size_t(const GImmOperand *operand, size_t *value, bool *negative)
+{
+    bool result;                            /* Bilan à renvoyer            */
+
+    *negative = g_imm_operand_is_negative(operand);
+
+    switch (operand->size)
+    {
+        case AOS_8_BITS_UNSIGNED:
+            result = (sizeof(size_t) >= 1);
+            if (result) *value = operand->unsigned_imm.val8;
+            break;
+        case AOS_16_BITS_UNSIGNED:
+            result = (sizeof(size_t) >= 2);
+            if (result) *value = operand->unsigned_imm.val16;
+            break;
+        case AOS_32_BITS_UNSIGNED:
+            result = (sizeof(size_t) >= 4);
+            if (result) *value = operand->unsigned_imm.val32;
+            break;
+        case AOS_64_BITS_UNSIGNED:
+            result = (sizeof(size_t) >= 8);
+            if (result) *value = operand->unsigned_imm.val64;
+            break;
+        case AOS_8_BITS_SIGNED:
+            result = (sizeof(size_t) >= 1);
+            if (result) *value = (*negative ? -1 : 1 ) * operand->signed_imm.val8;
+            break;
+        case AOS_16_BITS_SIGNED:
+            result = (sizeof(size_t) >= 2);
+            if (result) *value = (*negative ? -1 : 1 ) * operand->signed_imm.val16;
+            break;
+        case AOS_32_BITS_SIGNED:
+            result = (sizeof(size_t) >= 4);
+            if (result) *value = (*negative ? -1 : 1 ) * operand->signed_imm.val32;
+            break;
+        case AOS_64_BITS_SIGNED:
+            result = (sizeof(size_t) >= 8);
+            if (result) *value = (*negative ? -1 : 1 ) * operand->signed_imm.val64;
+            break;
+        default:
+            result = false;
+            break;
+    }
+
+    return result;
+
+}
diff --git a/src/arch/immediate.h b/src/arch/immediate.h
index 1dcc548..d3e4624 100644
--- a/src/arch/immediate.h
+++ b/src/arch/immediate.h
@@ -63,6 +63,9 @@ bool g_imm_operand_is_negative(const GImmOperand *);
 /* Convertit une valeur immédiate en adresse de type vmpa_t. */
 bool g_imm_operand_to_vmpa_t(const GImmOperand *, vmpa_t *);
 
+/* Convertit une valeur immédiate en valeur de type size_t. */
+bool g_imm_operand_to_size_t(const GImmOperand *, size_t *, bool *);
+
 
 
 #endif  /* _ARCH_IMMEDIATE_H */