Show closed interval map boundaries on 'om,' command

radareorg · Nov 19, 2023 · 281ab7a · 281ab7a
1 parent 9ece938
commit 281ab7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libr/core/cmd_open.inc.c b/libr/core/cmd_open.inc.c
@@ -627,11 +627,11 @@ static void r_core_cmd_omt(RCore *core, const char *arg) {
 			R_LOG_WARN ("Cannot find mapid %d", mapid);
 			break;
 		}
-		ut64 va = r_itv_begin (m->itv);
-		ut64 va_end = r_itv_end (m->itv);
+		ut64 va = r_io_map_from (m);
+		ut64 va_end = r_io_map_to (m);
 		ut64 pa = m->delta;
 		ut64 pa_size = r_itv_size (m->itv);
-		ut64 pa_end = pa + pa_size;
+		ut64 pa_end = pa + pa_size - 1;
 		const char *name = r_str_get (m->name);
 		r_table_add_rowf (t, "ddxxxxxss",
 			m->id, m->fd, pa, pa_end, pa_size,

diff --git a/test/db/anal/x86_32 b/test/db/anal/x86_32
@@ -3593,7 +3593,7 @@ e asm.bits=32
 e io.cache=true
 $orig_end=?e `om,va_end/cols~[0]:3`
 omr 1 `om,size/cols~[0]:3`+2
-s `$orig_end`
+s `$orig_end`+1
 wa jmp entry0
 aF
 aae