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

Updated radare2

Browse Source
This commit is contained in:
xarkes 2018-05-24 08:21:12 +02:00
parent 7fdfad32f7
commit 2391b4eff6
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radare2

@ -1 +1 @@
Subproject commit 31f6d8ecaa78370688e089cbead3180c3cadf80b Subproject commit 3c8d7d53fa5cb438f7462ff2403b4dfe4d33ddef

6
src/Cutter.cpp
View File

@ -748,9 +748,9 @@ void CutterCore::setSettings()
setConfig("asm.cmt.col", 70); setConfig("asm.cmt.col", 70);
setConfig("asm.xrefs", false); setConfig("asm.xrefs", false);
setConfig("asm.tabsonce", true); setConfig("asm.tabs.once", true);
setConfig("asm.tabsoff", 5); setConfig("asm.tabs.off", 5);
setConfig("asm.midflags", 2); setConfig("asm.flags.middle", 2);
setConfig("anal.hasnext", false); setConfig("anal.hasnext", false);
setConfig("asm.lines.call", false); setConfig("asm.lines.call", false);

16
src/dialogs/preferences/AsmOptionsWidget.cpp
View File

@ -37,11 +37,11 @@ void AsmOptionsWidget::updateAsmOptionsFromVars()
qhelpers::setCheckedWithoutSignals(ui->stackpointerCheckBox, Config()->getConfigBool("asm.stackptr")); qhelpers::setCheckedWithoutSignals(ui->stackpointerCheckBox, Config()->getConfigBool("asm.stackptr"));
qhelpers::setCheckedWithoutSignals(ui->slowCheckBox, Config()->getConfigBool("asm.slow")); qhelpers::setCheckedWithoutSignals(ui->slowCheckBox, Config()->getConfigBool("asm.slow"));
qhelpers::setCheckedWithoutSignals(ui->linesCheckBox, Config()->getConfigBool("asm.lines")); qhelpers::setCheckedWithoutSignals(ui->linesCheckBox, Config()->getConfigBool("asm.lines"));
qhelpers::setCheckedWithoutSignals(ui->fcnlinesCheckBox, Config()->getConfigBool("asm.fcnlines")); qhelpers::setCheckedWithoutSignals(ui->fcnlinesCheckBox, Config()->getConfigBool("asm.lines.fcn"));
qhelpers::setCheckedWithoutSignals(ui->flgoffCheckBox, Config()->getConfigBool("asm.flgoff")); qhelpers::setCheckedWithoutSignals(ui->flgoffCheckBox, Config()->getConfigBool("asm.flags.offset"));
qhelpers::setCheckedWithoutSignals(ui->emuCheckBox, Config()->getConfigBool("asm.emu")); qhelpers::setCheckedWithoutSignals(ui->emuCheckBox, Config()->getConfigBool("asm.emu"));
qhelpers::setCheckedWithoutSignals(ui->cmtrightCheckBox, Config()->getConfigBool("asm.cmt.right")); qhelpers::setCheckedWithoutSignals(ui->cmtrightCheckBox, Config()->getConfigBool("asm.cmt.right"));
qhelpers::setCheckedWithoutSignals(ui->varsumCheckBox, Config()->getConfigBool("asm.varsum")); qhelpers::setCheckedWithoutSignals(ui->varsumCheckBox, Config()->getConfigBool("asm.var.summary"));
qhelpers::setCheckedWithoutSignals(ui->sizeCheckBox, Config()->getConfigBool("asm.size")); qhelpers::setCheckedWithoutSignals(ui->sizeCheckBox, Config()->getConfigBool("asm.size"));
bool bytesEnabled = Config()->getConfigBool("asm.bytes"); bool bytesEnabled = Config()->getConfigBool("asm.bytes");
@ -148,13 +148,13 @@ void AsmOptionsWidget::on_linesCheckBox_toggled(bool checked)
void AsmOptionsWidget::on_fcnlinesCheckBox_toggled(bool checked) void AsmOptionsWidget::on_fcnlinesCheckBox_toggled(bool checked)
{ {
Config()->setConfig("asm.fcnlines", checked); Config()->setConfig("asm.lines.fcn", checked);
triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsWidget::on_flgoffCheckBox_toggled(bool checked) void AsmOptionsWidget::on_flgoffCheckBox_toggled(bool checked)
{ {
Config()->setConfig("asm.flgoff", checked); Config()->setConfig("asm.flags.off", checked);
triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
@ -172,7 +172,7 @@ void AsmOptionsWidget::on_cmtrightCheckBox_toggled(bool checked)
void AsmOptionsWidget::on_varsumCheckBox_toggled(bool checked) void AsmOptionsWidget::on_varsumCheckBox_toggled(bool checked)
{ {
Config()->setConfig("asm.varsum", checked); Config()->setConfig("asm.var.summary", checked);
triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
@ -262,14 +262,14 @@ void AsmOptionsWidget::on_bblineCheckBox_toggled(bool checked)
void AsmOptionsWidget::on_varsubCheckBox_toggled(bool checked) void AsmOptionsWidget::on_varsubCheckBox_toggled(bool checked)
{ {
Config()->setConfig("asm.varsub", checked); Config()->setConfig("asm.var.sub", checked);
ui->varsubOnlyCheckBox->setEnabled(checked); ui->varsubOnlyCheckBox->setEnabled(checked);
triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }
void AsmOptionsWidget::on_varsubOnlyCheckBox_toggled(bool checked) void AsmOptionsWidget::on_varsubOnlyCheckBox_toggled(bool checked)
{ {
Config()->setConfig("asm.varsub_only", checked); Config()->setConfig("asm.var.subonly", checked);
triggerAsmOptionsChanged(); triggerAsmOptionsChanged();
} }

12
src/dialogs/preferences/AsmOptionsWidget.ui
View File

@ -17,7 +17,7 @@
<item> <item>
<widget class="QTabWidget" name="asmOptionsTab"> <widget class="QTabWidget" name="asmOptionsTab">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="asmStyleTab"> <widget class="QWidget" name="asmStyleTab">
<attribute name="title"> <attribute name="title">
@ -172,14 +172,14 @@
<item> <item>
<widget class="QCheckBox" name="fcnlinesCheckBox"> <widget class="QCheckBox" name="fcnlinesCheckBox">
<property name="text"> <property name="text">
<string>Show function boundary lines (asm.fcnlines)</string> <string>Show function boundary lines (asm.lines.fcn)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="flgoffCheckBox"> <widget class="QCheckBox" name="flgoffCheckBox">
<property name="text"> <property name="text">
<string>Show offset before flags (asm.flgoff)</string> <string>Show offset before flags (asm.flags.off)</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -207,7 +207,7 @@
<item> <item>
<widget class="QCheckBox" name="varsumCheckBox"> <widget class="QCheckBox" name="varsumCheckBox">
<property name="text"> <property name="text">
<string>Show variables summary instead of full list (asm.varsum)</string> <string>Show variables summary instead of full list (asm.var.summary)</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -238,14 +238,14 @@
<item> <item>
<widget class="QCheckBox" name="varsubCheckBox"> <widget class="QCheckBox" name="varsubCheckBox">
<property name="text"> <property name="text">
<string>Substitute variables (asm.varsub)</string> <string>Substitute variables (asm.var.sub)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="varsubOnlyCheckBox"> <widget class="QCheckBox" name="varsubOnlyCheckBox">
<property name="text"> <property name="text">
<string>Substitute entire variable expressions with names (asm.varsub_only)</string> <string>Substitute entire variable expressions with names (asm.var.subonly)</string>
</property> </property>
</widget> </widget>
</item> </item>

10
src/utils/Configuration.cpp
View File

@ -18,11 +18,11 @@ static const QHash<QString, QVariant> asmOptions = {
{ "asm.stackptr", false }, { "asm.stackptr", false },
{ "asm.slow", true }, { "asm.slow", true },
{ "asm.lines", true }, { "asm.lines", true },
{ "asm.fcnlines", true }, { "asm.lines.fcn", true },
{ "asm.flgoff", false }, { "asm.flags.offset", false },
{ "asm.emu", false }, { "asm.emu", false },
{ "asm.cmt.right", true }, { "asm.cmt.right", true },
{ "asm.varsum", false }, { "asm.var.summary", false },
{ "asm.bytes", false }, { "asm.bytes", false },
{ "asm.size", false }, { "asm.size", false },
{ "asm.bytespace", false }, { "asm.bytespace", false },
@ -32,8 +32,8 @@ static const QHash<QString, QVariant> asmOptions = {
{ "asm.ucase", false }, { "asm.ucase", false },
{ "asm.bbline", false }, { "asm.bbline", false },
{ "asm.capitalize", false }, { "asm.capitalize", false },
{ "asm.varsub", true }, { "asm.var.sub", true },
{ "asm.varsub_only", true }, { "asm.var.subonly", true },
{ "asm.tabs", 5 } { "asm.tabs", 5 }
}; };

2
src/widgets/DisassemblerGraphView.cpp
View File

@ -124,7 +124,7 @@ void DisassemblerGraphView::loadCurrentGraph()
.set("scr.color", COLOR_MODE_16M) .set("scr.color", COLOR_MODE_16M)
.set("asm.bbline", false) .set("asm.bbline", false)
.set("asm.lines", false) .set("asm.lines", false)
.set("asm.fcnlines", false); .set("asm.lines.fcn", false);
QJsonDocument functionsDoc = Core()->cmdj("agJ"); QJsonDocument functionsDoc = Core()->cmdj("agJ");
QJsonArray functions = functionsDoc.array(); QJsonArray functions = functionsDoc.array();