[nemiver] Update as Asm types changed
- From: Dodji Seketeli <dodji src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nemiver] Update as Asm types changed
- Date: Mon, 6 Sep 2010 19:52:26 +0000 (UTC)
commit eca15a386e7a786720292689c72c34ef94d605c3
Author: Dodji Seketeli <dodji gnome org>
Date: Sun Aug 22 15:35:24 2010 +0200
Update as Asm types changed
* src/dbgengine/nmv-asm-utils.h: Mechanical replacement of
IDebugger::AsmInstr, IDebugger::MixedAsmInstr, IDebugger::Asm and
IDebugger::DisassembleInfo by common::AsmInstr,
common::MixedAsmInstr, common::Asm and common::DisassembleInfo.
* src/dbgengine/nmv-dbg-common.h: Likewise.
* src/dbgengine/nmv-gdb-engine.cc: Likewise.
* src/dbgengine/nmv-gdb-engine.h: Likewise.
* src/dbgengine/nmv-gdbmi-parser.cc: Likewise.
* src/dbgengine/nmv-gdbmi-parser.h: Likewise.
* src/persp/dbgperspective/nmv-dbg-perspective.cc: Likewise.
* src/persp/dbgperspective/nmv-dbg-perspective.h: Likewise.
* tests/test-disassemble.cc: Likewise.
* tests/test-gdbmi.cc: Likewise.
src/dbgengine/nmv-asm-utils.h | 12 ++--
src/dbgengine/nmv-dbg-common.h | 6 +-
src/dbgengine/nmv-gdb-engine.cc | 18 ++--
src/dbgengine/nmv-gdb-engine.h | 4 +-
src/dbgengine/nmv-gdbmi-parser.cc | 26 +++---
src/dbgengine/nmv-gdbmi-parser.h | 6 +-
src/persp/dbgperspective/nmv-dbg-perspective.cc | 94 +++++++++++-----------
src/persp/dbgperspective/nmv-dbg-perspective.h | 4 +-
tests/test-disassemble.cc | 10 +-
tests/test-gdbmi.cc | 2 +-
10 files changed, 91 insertions(+), 91 deletions(-)
---
diff --git a/src/dbgengine/nmv-asm-utils.h b/src/dbgengine/nmv-asm-utils.h
index 7a17df2..80de0d2 100644
--- a/src/dbgengine/nmv-asm-utils.h
+++ b/src/dbgengine/nmv-asm-utils.h
@@ -32,7 +32,7 @@ NEMIVER_BEGIN_NAMESPACE (nemiver)
template<class Stream>
Stream&
-operator<< (Stream &a_out, const IDebugger::AsmInstr &a_instr)
+operator<< (Stream &a_out, const common::AsmInstr &a_instr)
{
a_out << "<asm-instr>\n"
<< " <addr>" << a_instr.address () << "</addr>\n"
@@ -45,13 +45,13 @@ operator<< (Stream &a_out, const IDebugger::AsmInstr &a_instr)
template<class Stream>
Stream&
-operator<< (Stream &a_out, const IDebugger::MixedAsmInstr &a_instr)
+operator<< (Stream &a_out, const common::MixedAsmInstr &a_instr)
{
a_out << "<asm-mixed-instr>\n"
<< " <line>" << a_instr.line_number () << "</line>\n"
<< " <path>" << a_instr.file_path () << "</path>\n";
- list<IDebugger::AsmInstr>::const_iterator it;
+ list<common::AsmInstr>::const_iterator it;
a_out << " <asm-instr-list>";
for (it = a_instr.instrs ().begin ();
it != a_instr.instrs ().end ();
@@ -72,13 +72,13 @@ operator<< (Stream &a_out, const IDebugger::MixedAsmInstr &a_instr)
template<class Stream>
Stream&
-operator<< (Stream &a_out, const IDebugger::Asm &a_asm)
+operator<< (Stream &a_out, const common::Asm &a_asm)
{
switch (a_asm.which ()) {
- case IDebugger::Asm::TYPE_PURE:
+ case common::Asm::TYPE_PURE:
a_out << a_asm.instr ();
break;
- case IDebugger::Asm::TYPE_MIXED:
+ case common::Asm::TYPE_MIXED:
a_out << a_asm.mixed_instr ();
break;
default:
diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h
index a2c4992..0cbe9ea 100644
--- a/src/dbgengine/nmv-dbg-common.h
+++ b/src/dbgengine/nmv-dbg-common.h
@@ -406,7 +406,7 @@ public:
bool m_has_memory_values;
// asm instruction list
- std::list<IDebugger::Asm> m_asm_instrs;
+ std::list<common::Asm> m_asm_instrs;
bool m_has_asm_instrs;
// Variable Object
@@ -557,12 +557,12 @@ public:
bool has_asm_instruction_list () const {return m_has_asm_instrs;}
void has_asm_instruction_list (bool a) {m_has_asm_instrs = a;}
- const std::list<IDebugger::Asm>& asm_instruction_list () const
+ const std::list<common::Asm>& asm_instruction_list () const
{
return m_asm_instrs;
}
void asm_instruction_list
- (const std::list<IDebugger::Asm> &a_asms)
+ (const std::list<common::Asm> &a_asms)
{
m_asm_instrs = a_asms;
m_has_asm_instrs = true;
diff --git a/src/dbgengine/nmv-gdb-engine.cc b/src/dbgengine/nmv-gdb-engine.cc
index 0b1880a..dfd4b7b 100644
--- a/src/dbgengine/nmv-gdb-engine.cc
+++ b/src/dbgengine/nmv-gdb-engine.cc
@@ -271,8 +271,8 @@ public:
set_memory_signal;
mutable sigc::signal<void,
- const IDebugger::DisassembleInfo&,
- const std::list<IDebugger::Asm>&,
+ const common::DisassembleInfo&,
+ const std::list<common::Asm>&,
const UString& /*cookie*/> instructions_disassembled_signal;
mutable sigc::signal<void, const VariableSafePtr, const UString&>
@@ -2339,15 +2339,15 @@ struct OnDisassembleHandler : OutputHandler {
THROW_IF_FAIL (m_engine);
- const std::list<IDebugger::Asm>& instrs =
+ const std::list<common::Asm>& instrs =
a_in.output ().result_record ().asm_instruction_list ();
- IDebugger::DisassembleInfo info;
+ common::DisassembleInfo info;
if (a_in.command ().name () == "disassemble-line-range-in-file") {
info.file_name (a_in.command ().tag0 ());
}
if (!instrs.empty ()) {
- std::list<IDebugger::Asm>::const_iterator it = instrs.begin ();
+ std::list<common::Asm>::const_iterator it = instrs.begin ();
if (!it->empty ()) {
info.start_address ((*it).instr ().address ());
it = instrs.end ();
@@ -3172,8 +3172,8 @@ GDBEngine::program_finished_signal () const
}
sigc::signal<void,
- const IDebugger::DisassembleInfo&,
- const std::list<IDebugger::Asm>&,
+ const common::DisassembleInfo&,
+ const std::list<common::Asm>&,
const UString& /*cookie*/>&
GDBEngine::instructions_disassembled_signal () const
{
@@ -4470,8 +4470,8 @@ GDBEngine::set_memory (size_t a_addr,
}
void
-null_disass_slot (const IDebugger::DisassembleInfo &,
- const std::list<IDebugger::Asm> &)
+null_disass_slot (const common::DisassembleInfo &,
+ const std::list<common::Asm> &)
{
}
diff --git a/src/dbgengine/nmv-gdb-engine.h b/src/dbgengine/nmv-gdb-engine.h
index 7998a93..cd36ef1 100644
--- a/src/dbgengine/nmv-gdb-engine.h
+++ b/src/dbgengine/nmv-gdb-engine.h
@@ -175,8 +175,8 @@ public:
sigc::signal <void, size_t, const std::vector<uint8_t>&, const UString& >&
set_memory_signal () const;
sigc::signal<void,
- const IDebugger::DisassembleInfo&,
- const std::list<IDebugger::Asm>&,
+ const common::DisassembleInfo&,
+ const std::list<common::Asm>&,
const UString& /*cookie*/>&
instructions_disassembled_signal () const;
diff --git a/src/dbgengine/nmv-gdbmi-parser.cc b/src/dbgengine/nmv-gdbmi-parser.cc
index 377663f..7d1f6fe 100644
--- a/src/dbgengine/nmv-gdbmi-parser.cc
+++ b/src/dbgengine/nmv-gdbmi-parser.cc
@@ -1948,7 +1948,7 @@ fetch_gdbmi_result:
} else if (!RAW_INPUT.compare (cur,
strlen (PREFIX_ASM_INSTRUCTIONS),
PREFIX_ASM_INSTRUCTIONS)) {
- std::list<IDebugger::Asm> asm_instrs;
+ std::list<common::Asm> asm_instrs;
if (!parse_asm_instruction_list (cur, cur,
asm_instrs)) {
LOG_PARSING_ERROR2 (cur);
@@ -3929,7 +3929,7 @@ bool
GDBMIParser::parse_asm_instruction_list
(UString::size_type a_from,
UString::size_type &a_to,
- std::list<IDebugger::Asm> &a_instrs)
+ std::list<common::Asm> &a_instrs)
{
LOG_FUNCTION_SCOPE_NORMAL_D (GDBMI_PARSING_DOMAIN);
UString::size_type cur = a_from;
@@ -3982,22 +3982,22 @@ GDBMIParser::parse_asm_instruction_list
// or a list of result, like described earlier. Figure out which is
// which and parse the damn thing accordingly.
if (gdbmi_list->content_type () == GDBMIList::VALUE_TYPE) {
- list<IDebugger::AsmInstr> instrs;
+ list<common::AsmInstr> instrs;
if (!analyse_pure_asm_instrs (gdbmi_list, instrs, cur)) {
LOG_PARSING_ERROR2 (cur);
return false;
}
- list<IDebugger::AsmInstr>::const_iterator it;
+ list<common::AsmInstr>::const_iterator it;
for (it = instrs.begin (); it != instrs.end (); ++it) {
a_instrs.push_back (*it);
}
} else if (gdbmi_list->content_type () == GDBMIList::RESULT_TYPE) {
- list<IDebugger::MixedAsmInstr> instrs;
+ list<common::MixedAsmInstr> instrs;
if (!analyse_mixed_asm_instrs (gdbmi_list, instrs, cur)) {
LOG_PARSING_ERROR2 (cur);
return false;
}
- list<IDebugger::MixedAsmInstr>::const_iterator it;
+ list<common::MixedAsmInstr>::const_iterator it;
for (it = instrs.begin (); it != instrs.end (); ++it) {
a_instrs.push_back (*it);
}
@@ -4026,13 +4026,13 @@ GDBMIParser::parse_asm_instruction_list
//
bool
GDBMIParser::analyse_pure_asm_instrs (GDBMIListSafePtr a_gdbmi_list,
- list<IDebugger::AsmInstr> &a_instrs,
+ list<common::AsmInstr> &a_instrs,
string::size_type /*a_cur*/)
{
list<GDBMIValueSafePtr> vals;
a_gdbmi_list->get_value_content (vals);
list<GDBMIValueSafePtr>::const_iterator val_iter;
- IDebugger::AsmInstr asm_instr;
+ common::AsmInstr asm_instr;
// Loop over the tuples contained in a_gdbmi_list.
// Each tuple represents an asm instruction descriptor that can have
// up to four fields:
@@ -4080,7 +4080,7 @@ GDBMIParser::analyse_pure_asm_instrs (GDBMIListSafePtr a_gdbmi_list,
LOG_DD ("instr: " << instr);
}
}
- asm_instr = IDebugger::AsmInstr (addr, func_name, offset, instr);
+ asm_instr = common::AsmInstr (addr, func_name, offset, instr);
a_instrs.push_back (asm_instr);
}
return true;
@@ -4097,11 +4097,11 @@ GDBMIParser::analyse_pure_asm_instrs (GDBMIListSafePtr a_gdbmi_list,
// line_asm_insn=[{address="0x000107bc",func-name="main",offset="0",
// inst="save %sp, -112, %sp"}]
// }
-// Return a list of IDebugger::MixedAsmInstr representing the list of
+// Return a list of common::MixedAsmInstr representing the list of
// RESULT above.
bool
GDBMIParser::analyse_mixed_asm_instrs (GDBMIListSafePtr a_gdbmi_list,
- list<IDebugger::MixedAsmInstr> &a_instrs,
+ list<common::MixedAsmInstr> &a_instrs,
string::size_type a_cur)
{
@@ -4140,7 +4140,7 @@ GDBMIParser::analyse_mixed_asm_instrs (GDBMIListSafePtr a_gdbmi_list,
const list<GDBMIResultSafePtr> &inner_results =
(*outer_it)->value ()->get_tuple_content ()->content ();
- IDebugger::MixedAsmInstr instr;
+ common::MixedAsmInstr instr;
for (inner_it = inner_results.begin ();
inner_it != inner_results.end ();
++inner_it) {
@@ -4163,7 +4163,7 @@ GDBMIParser::analyse_mixed_asm_instrs (GDBMIListSafePtr a_gdbmi_list,
instr.file_path (val->get_string_content ());
} else if ((*inner_it)->variable () == "line_asm_insn"
&& inner_result_type == GDBMIValue::LIST_TYPE) {
- list<IDebugger::AsmInstr> &instrs = instr.instrs ();
+ list<common::AsmInstr> &instrs = instr.instrs ();
if (!analyse_pure_asm_instrs (val->get_list_content (),
instrs, a_cur)) {
stringstream s;
diff --git a/src/dbgengine/nmv-gdbmi-parser.h b/src/dbgengine/nmv-gdbmi-parser.h
index 3eba502..79b482d 100644
--- a/src/dbgengine/nmv-gdbmi-parser.h
+++ b/src/dbgengine/nmv-gdbmi-parser.h
@@ -325,11 +325,11 @@ class GDBMIParser {
SafePtr<Priv> m_priv;
bool analyse_pure_asm_instrs (GDBMIListSafePtr,
- list<IDebugger::AsmInstr>&,
+ list<common::AsmInstr>&,
string::size_type a_cur);
bool analyse_mixed_asm_instrs (GDBMIListSafePtr,
- list<IDebugger::MixedAsmInstr>&,
+ list<common::MixedAsmInstr>&,
string::size_type a_cur);
public:
@@ -616,7 +616,7 @@ public:
/// by GDB/MI
bool parse_asm_instruction_list (UString::size_type a_from,
UString::size_type &a_to,
- std::list<IDebugger::Asm> &a_asm);
+ std::list<common::Asm> &a_asm);
bool parse_variable (UString::size_type a_from,
UString::size_type &a_to,
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 87e0b09..c3152e3 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -213,9 +213,9 @@ gnome_vfs_file_monitor_cb (GnomeVFSMonitorHandle *a_handle,
#endif
static void
-log_asm_insns (std::list<IDebugger::Asm> a_asm)
+log_asm_insns (std::list<common::Asm> a_asm)
{
- typedef std::list<IDebugger::Asm> Asms;
+ typedef std::list<common::Asm> Asms;
Asms::const_iterator it = a_asm.begin ();
if (it != a_asm.end ()) {
LOG_D (*it, DBG_PERSPECTIVE_ASM_DOMAIN);
@@ -415,24 +415,24 @@ private:
const UString &a_cooker);
void on_debugger_asm_signal1
- (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_instrs,
+ (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_instrs,
bool a_show_asm_in_new_tab = true);
void on_debugger_asm_signal2
- (const IDebugger::DisassembleInfo &info,
- const std::list<IDebugger::Asm> &instrs,
+ (const common::DisassembleInfo &info,
+ const std::list<common::Asm> &instrs,
SourceEditor *editor);
void on_debugger_asm_signal3
- (const IDebugger::DisassembleInfo &info,
- const std::list<IDebugger::Asm> &instrs,
+ (const common::DisassembleInfo &info,
+ const std::list<common::Asm> &instrs,
SourceEditor *editor,
const IDebugger::Breakpoint &a_bp);
void on_debugger_asm_signal4
- (const IDebugger::DisassembleInfo &info,
- const std::list<IDebugger::Asm> &instrs,
+ (const common::DisassembleInfo &info,
+ const std::list<common::Asm> &instrs,
const Address &address);
void on_variable_created_for_tooltip_signal
@@ -571,31 +571,31 @@ public:
bool is_asm_title (const UString &);
- bool load_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+ bool load_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
Glib::RefPtr<gtksourceview::SourceBuffer> &a_buf);
bool read_file_line (const UString&, int, string&);
bool write_asm_instr (std::ostringstream&,
- const IDebugger::AsmInstr&);
+ const common::AsmInstr&);
bool write_asm_instr (std::ostringstream&,
- const IDebugger::Asm&);
+ const common::Asm&);
- bool add_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+ bool add_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
Glib::RefPtr<gtksourceview::SourceBuffer> &a_buf,
bool a_append = true);
- SourceEditor* open_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+ SourceEditor* open_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
bool set_where = false);
- void switch_to_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm);
+ void switch_to_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm);
- void switch_to_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+ void switch_to_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
SourceEditor *a_editor);
void pump_asm_including_address (SourceEditor *a_editor,
@@ -2737,8 +2737,8 @@ DBGPerspective::on_debugger_variable_value_signal
void
DBGPerspective::on_debugger_asm_signal1
- (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_instrs,
+ (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_instrs,
bool a_show_asm_in_new_tab)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -2756,8 +2756,8 @@ DBGPerspective::on_debugger_asm_signal1
void
DBGPerspective::on_debugger_asm_signal2
- (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_instrs,
+ (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_instrs,
SourceEditor *a_editor)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -2771,8 +2771,8 @@ DBGPerspective::on_debugger_asm_signal2
void
DBGPerspective::on_debugger_asm_signal3
- (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_instrs,
+ (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_instrs,
SourceEditor *a_editor,
const IDebugger::Breakpoint &a_bp)
{
@@ -2788,8 +2788,8 @@ DBGPerspective::on_debugger_asm_signal3
void
DBGPerspective::on_debugger_asm_signal4
- (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_instrs,
+ (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_instrs,
const Address &a_address)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -5871,8 +5871,8 @@ DBGPerspective::is_asm_title (const UString &a_path)
}
bool
-DBGPerspective::load_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+DBGPerspective::load_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
Glib::RefPtr<SourceBuffer> &a_source_buffer)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -5957,7 +5957,7 @@ DBGPerspective::read_file_line (const UString &a_file_path,
bool
DBGPerspective::write_asm_instr (std::ostringstream &a_os,
- const IDebugger::AsmInstr &a_instr)
+ const common::AsmInstr &a_instr)
{
a_os << a_instr.address ();
a_os << " ";
@@ -5972,17 +5972,17 @@ DBGPerspective::write_asm_instr (std::ostringstream &a_os,
bool
DBGPerspective::write_asm_instr (std::ostringstream &a_os,
- const IDebugger::Asm &a_asm)
+ const common::Asm &a_asm)
{
bool written = false;
switch (a_asm.which ()) {
- case IDebugger::Asm::TYPE_PURE:
+ case common::Asm::TYPE_PURE:
write_asm_instr (a_os, a_asm.instr ());
written = true;
break;
- case IDebugger::Asm::TYPE_MIXED: {
- const IDebugger::MixedAsmInstr &instr = a_asm.mixed_instr ();
+ case common::Asm::TYPE_MIXED: {
+ const common::MixedAsmInstr &instr = a_asm.mixed_instr ();
// Ignore requests for line 0. Line 0 cannot exist as lines
// should be starting at 1., some
// versions of GDB seem to be referencing it for a reason.
@@ -6010,7 +6010,7 @@ DBGPerspective::write_asm_instr (std::ostringstream &a_os,
}
if (!instr.instrs ().empty ()) {
- list<IDebugger::AsmInstr>::const_iterator it =
+ list<common::AsmInstr>::const_iterator it =
instr.instrs ().begin ();
if (it != instr.instrs ().end ()) {
if (written)
@@ -6033,8 +6033,8 @@ DBGPerspective::write_asm_instr (std::ostringstream &a_os,
}
bool
-DBGPerspective::add_asm (const IDebugger::DisassembleInfo &/*a_info*/,
- const std::list<IDebugger::Asm> &a_asm,
+DBGPerspective::add_asm (const common::DisassembleInfo &/*a_info*/,
+ const std::list<common::Asm> &a_asm,
Glib::RefPtr<SourceBuffer> &a_buf,
bool a_append)
{
@@ -6045,7 +6045,7 @@ DBGPerspective::add_asm (const IDebugger::DisassembleInfo &/*a_info*/,
log_asm_insns (a_asm);
- std::list<IDebugger::Asm>::const_iterator it = a_asm.begin ();
+ std::list<common::Asm>::const_iterator it = a_asm.begin ();
if (it == a_asm.end ())
return true;
@@ -6094,8 +6094,8 @@ DBGPerspective::add_asm (const IDebugger::DisassembleInfo &/*a_info*/,
// source buffer of the asm tab.
// Return true upon successful completion, false otherwise.
SourceEditor*
-DBGPerspective::open_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+DBGPerspective::open_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
bool a_set_where)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -6136,8 +6136,8 @@ DBGPerspective::open_asm (const IDebugger::DisassembleInfo &a_info,
// \param a_info descriptor of the assembly instructions
// \param a_asm a list of asm instructions.
void
-DBGPerspective::switch_to_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm)
+DBGPerspective::switch_to_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -6150,8 +6150,8 @@ DBGPerspective::switch_to_asm (const IDebugger::DisassembleInfo &a_info,
// \param a_info descriptor of the assembly instructions
// \param a_asm a list of asm instructions.
void
-DBGPerspective::switch_to_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+DBGPerspective::switch_to_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
SourceEditor *a_source_editor)
{
if (!a_source_editor)
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.h b/src/persp/dbgperspective/nmv-dbg-perspective.h
index 46df6ce..dfeb5d6 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.h
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.h
@@ -73,8 +73,8 @@ public:
virtual void close_file (const UString &a_uri) = 0;
- virtual bool load_asm (const IDebugger::DisassembleInfo &a_info,
- const std::list<IDebugger::Asm> &a_asm,
+ virtual bool load_asm (const common::DisassembleInfo &a_info,
+ const std::list<common::Asm> &a_asm,
Glib::RefPtr<gtksourceview::SourceBuffer> &a_buf) = 0;
virtual Gtk::Widget* load_menu (const UString &a_filename,
diff --git a/tests/test-disassemble.cc b/tests/test-disassemble.cc
index 94b4ee8..4e5ba4b 100644
--- a/tests/test-disassemble.cc
+++ b/tests/test-disassemble.cc
@@ -61,18 +61,18 @@ on_program_finished_signal ()
BOOST_REQUIRE (counter2 == 3);
}
-typedef list<IDebugger::Asm> AsmInstrs;
+typedef list<common::Asm> AsmInstrs;
void
-on_instructions_disassembled_signal0 (const IDebugger::DisassembleInfo &a_info,
+on_instructions_disassembled_signal0 (const common::DisassembleInfo &a_info,
const AsmInstrs &a_instrs,
const UString &/*a_cookie*/);
void
-on_instructions_disassembled_signal1 (const IDebugger::DisassembleInfo &,
+on_instructions_disassembled_signal1 (const common::DisassembleInfo &,
const AsmInstrs &a_instrs);
void
-on_instructions_disassembled_signal0 (const IDebugger::DisassembleInfo &a_info,
+on_instructions_disassembled_signal0 (const common::DisassembleInfo &a_info,
const AsmInstrs &a_instrs,
const UString &/*a_cookie*/)
{
@@ -81,7 +81,7 @@ on_instructions_disassembled_signal0 (const IDebugger::DisassembleInfo &a_info,
}
void
-on_instructions_disassembled_signal1 (const IDebugger::DisassembleInfo &,
+on_instructions_disassembled_signal1 (const common::DisassembleInfo &,
const AsmInstrs &a_instrs)
{
cout << "<AssemblyInstructionList nb='" << a_instrs.size ()
diff --git a/tests/test-gdbmi.cc b/tests/test-gdbmi.cc
index c757f88..f78d01b 100644
--- a/tests/test-gdbmi.cc
+++ b/tests/test-gdbmi.cc
@@ -884,7 +884,7 @@ test_breakpoint ()
void
test_disassemble ()
{
- typedef list<IDebugger::Asm> AsmInstrList;
+ typedef list<common::Asm> AsmInstrList;
AsmInstrList instrs;
UString::size_type cur = 0;
GDBMIParser parser (gv_disassemble0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
