Fixed the continuation dumping of instructions to properly advance the
previous address only by the number of bytes consumed by the disassembly:
(lldb) x/4i 0x0000000100000ea9
0x100000ea9: 66 c7 45 fa 10 00 movw $16, -6(%rbp)
0x100000eaf: c7 45 f4 20 00 00 00 movl $32, -12(%rbp)
0x100000eb6: e8 47 00 00 00 callq 0x0000000100000f02 ; void f<nullptr_t>(nullptr_t)
0x100000ebb: 8b 45 fc movl -4(%rbp), %eax
(lldb)
0x100000ebe: 48 83 c4 10 addq $16, %rsp
0x100000ec2: 5d popq %rbp
0x100000ec3: c3 ret
0x100000ec4: 90 nop
(lldb)
0x100000ec5: 90 nop
0x100000ec6: 90 nop
0x100000ec7: 90 nop
0x100000ec8: 90 nop
(lldb)
0x100000ec9: 90 nop
0x100000eca: 90 nop
0x100000ecb: 90 nop
0x100000ecc: 90 nop
(lldb)
0x100000ecd: 90 nop
0x100000ece: 90 nop
0x100000ecf: 90 nop
0x100000ed0: 55 pushq %rbp
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@143254 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Commands/CommandObjectMemory.cpp b/source/Commands/CommandObjectMemory.cpp
index 7a16a60..1a0c165 100644
--- a/source/Commands/CommandObjectMemory.cpp
+++ b/source/Commands/CommandObjectMemory.cpp
@@ -726,16 +726,17 @@
assert (output_stream);
- data.Dump (output_stream,
- 0,
- m_format_options.GetFormat(),
- item_byte_size,
- item_count,
- num_per_line,
- addr,
- 0,
- 0,
- exe_scope);
+ uint32_t bytes_dumped = data.Dump (output_stream,
+ 0,
+ m_format_options.GetFormat(),
+ item_byte_size,
+ item_count,
+ num_per_line,
+ addr,
+ 0,
+ 0,
+ exe_scope);
+ m_next_addr = addr + bytes_dumped;
output_stream->EOL();
return true;
}