summaryrefslogtreecommitdiff
path: root/src/analysis/db/items
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2017-03-29 21:01:51 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2017-03-29 21:01:51 (GMT)
commitb8d5a539b1e6837f7395598a3fa25ef69650e885 (patch)
tree2fbf770b1aebf1b66a8ac87e2eeae4521775d092 /src/analysis/db/items
parent4f3f96c2c98ac507f4aa7c83e2393c5c1fdd3cdd (diff)
Handled areas which are not allocated in memory.
Diffstat (limited to 'src/analysis/db/items')
-rw-r--r--src/analysis/db/items/comment.c5
-rw-r--r--src/analysis/db/items/move.c12
-rw-r--r--src/analysis/db/items/switcher.c5
3 files changed, 5 insertions, 17 deletions
diff --git a/src/analysis/db/items/comment.c b/src/analysis/db/items/comment.c
index 50522d9..263f415 100644
--- a/src/analysis/db/items/comment.c
+++ b/src/analysis/db/items/comment.c
@@ -544,10 +544,7 @@ static void g_db_comment_build_label(GDbComment *comment)
{
VMPA_BUFFER(loc); /* Indication de position */
- if (has_virt_addr(&comment->addr))
- vmpa2_virt_to_string(&comment->addr, MDS_UNDEFINED, loc, NULL);
- else
- vmpa2_phys_to_string(&comment->addr, MDS_UNDEFINED, loc, NULL);
+ vmpa2_to_string(&comment->addr, MDS_UNDEFINED, loc, NULL);
if (is_rle_string_empty(&comment->text))
asprintf(&G_DB_ITEM(comment)->label, _("Delete comment at %s"), loc);
diff --git a/src/analysis/db/items/move.c b/src/analysis/db/items/move.c
index f6e585d..4fd1667 100644
--- a/src/analysis/db/items/move.c
+++ b/src/analysis/db/items/move.c
@@ -388,15 +388,9 @@ static void g_db_move_build_label(GDbMove *move)
VMPA_BUFFER(src_loc); /* Indication de position #1 */
VMPA_BUFFER(dest_loc); /* Indication de position #2 */
- if (has_virt_addr(&move->src))
- vmpa2_virt_to_string(&move->src, MDS_UNDEFINED, src_loc, NULL);
- else
- vmpa2_phys_to_string(&move->src, MDS_UNDEFINED, src_loc, NULL);
-
- if (has_virt_addr(&move->dest))
- vmpa2_virt_to_string(&move->dest, MDS_UNDEFINED, dest_loc, NULL);
- else
- vmpa2_phys_to_string(&move->dest, MDS_UNDEFINED, dest_loc, NULL);
+ vmpa2_to_string(&move->src, MDS_UNDEFINED, src_loc, NULL);
+
+ vmpa2_to_string(&move->dest, MDS_UNDEFINED, dest_loc, NULL);
asprintf(&G_DB_ITEM(move)->label, _("Move from %s to %s"), src_loc, dest_loc);
diff --git a/src/analysis/db/items/switcher.c b/src/analysis/db/items/switcher.c
index 9cd2a2e..b7957ff 100644
--- a/src/analysis/db/items/switcher.c
+++ b/src/analysis/db/items/switcher.c
@@ -449,10 +449,7 @@ static void g_db_switcher_build_label(GDbSwitcher *switcher)
{
VMPA_BUFFER(loc); /* Indication de position */
- if (has_virt_addr(&switcher->addr))
- vmpa2_virt_to_string(&switcher->addr, MDS_UNDEFINED, loc, NULL);
- else
- vmpa2_phys_to_string(&switcher->addr, MDS_UNDEFINED, loc, NULL);
+ vmpa2_to_string(&switcher->addr, MDS_UNDEFINED, loc, NULL);
switch (switcher->display)
{