ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-24 13:55:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes #3 and other related issues

Browse Source
This commit is contained in:
Hugo Teso 2017-04-06 12:14:28 +02:00
parent 5032c9104d
commit ba8f60fe56
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainwindow.cpp
View File

@ -825,7 +825,8 @@ void MainWindow::on_backButton_clicked()
this->core->cmd("s-"); this->core->cmd("s-");
QString back_offset = this->core->cmd("s=").split(" > ").last().trimmed(); QString back_offset = this->core->cmd("s=").split(" > ").last().trimmed();
if (back_offset != "") { if (back_offset != "") {
this->seek(back_offset); QString fcn = this->core->cmdFunctionAt(back_offset);
this->seek(this->memoryDock->normalizeAddr(back_offset), fcn);
} }
} }

6
src/widgets/memwidget/memorywidget.cpp
View File

@ -1597,9 +1597,9 @@ bool MemoryWidget::eventFilter(QObject *obj, QEvent *event) {
jump = this->main->core->getOffsetJump(ele); jump = this->main->core->getOffsetJump(ele);
if (jump != "") { if (jump != "") {
if (jump.contains("0x")) { if (jump.contains("0x")) {
RAnalFunction *fcn = this->main->core->functionAt(jump.toLongLong(0, 16)); QString fcn = this->main->core->cmdFunctionAt(jump);
if (fcn) { if (fcn != "") {
this->main->seek(jump, fcn->name); this->main->seek(jump.trimmed(), fcn);
} }
} else { } else {
this->main->seek(this->main->core->cmd("?v " + jump), jump); this->main->seek(this->main->core->cmd("?v " + jump), jump);

3
src/widgets/memwidget/memorywidget.h
View File

@ -72,6 +72,8 @@ public slots:
QString normalize_addr(QString addr); QString normalize_addr(QString addr);
QString normalizeAddr(QString addr);
void setFcnName(QString addr); void setFcnName(QString addr);
void setMiniGraph(QString at); void setMiniGraph(QString at);
@ -164,7 +166,6 @@ private slots:
void on_copyMD5_clicked(); void on_copyMD5_clicked();
void on_copySHA1_clicked(); void on_copySHA1_clicked();
void on_simpleGrapgToolButton_clicked(); void on_simpleGrapgToolButton_clicked();
QString normalizeAddr(QString addr);
void on_opcodeDescButton_clicked(); void on_opcodeDescButton_clicked();
void seek_back(); void seek_back();
}; };