summaryrefslogtreecommitdiff
path: root/src/arch/vmpa.c
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2015-12-29 15:08:17 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2015-12-29 15:08:17 (GMT)
commit5cad06b6a52e17d5649e0152c15745a96f7c0efa (patch)
treee26b0857ed6cddd70bce33f983a97e5245fae3fe /src/arch/vmpa.c
parent73fb6dd90282dd10a6c3febe7348ad698c0336a8 (diff)
Handled ELF overlapping program and section headers.
Diffstat (limited to 'src/arch/vmpa.c')
-rw-r--r--src/arch/vmpa.c42
1 files changed, 42 insertions, 0 deletions
diff --git a/src/arch/vmpa.c b/src/arch/vmpa.c
index a2430b5..e2da876 100644
--- a/src/arch/vmpa.c
+++ b/src/arch/vmpa.c
@@ -990,6 +990,48 @@ bool mrange_contains_addr_inclusive(const mrange_t *range, const vmpa2t *addr)
/******************************************************************************
* *
* Paramètres : range = zone mémoire à consulter. *
+* other = autre zone mémoire à manipuler. *
+* *
+* Description : Détermine si deux zones mémoire se chevauchent ou non. *
+* *
+* Retour : Bilan de la consultation. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+bool mrange_intersects_mrange(const mrange_t *range, const mrange_t *other)
+{
+ bool result; /* Bilan à retourner */
+ vmpa2t end; /* Fin d'une zone mémoire */
+
+ result = false;
+
+ result |= mrange_contains_addr(range, &other->addr);
+ result |= mrange_contains_addr(other, &range->addr);
+
+ if (get_mrange_length(other) > 0)
+ {
+ compute_mrange_end_addr(other, &end);
+ deminish_vmpa(&end, 1);
+ result |= mrange_contains_addr(range, &end);
+ }
+
+ if (get_mrange_length(range) > 0)
+ {
+ compute_mrange_end_addr(range, &end);
+ deminish_vmpa(&end, 1);
+ result |= mrange_contains_addr(other, &end);
+ }
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : range = zone mémoire à consulter. *
* addr = localisation mémoire à déterminer. *
* *
* Description : Calcule la position extérieure finale d'une couverture. *