ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build failures when compiling Cutter with Rizin's dev

Browse Source 
* `rz_debug_stop` returns an `int`, so we cannot cast it to
      `RxConsBreak`, which is a typedef of a function signature
      returning `void`
    * `rz_debug_bp_add` siggnatue was recently modified, and thus Cutter
       couldn't build with the new signature
    * `rz_bin_object_get_imports` was also modified recently to return a
      `RzPVector`, thus it also needed to be updated in Cutter
This commit is contained in:
Dhruv Maroo 2023-09-20 06:41:52 +05:30 committed by Anton Kochkov
parent 1e1c93d9d1
commit c8c625a830
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/Cutter.cpp
View File

@ -2372,7 +2372,9 @@ void CutterCore::continueUntilSyscall()
} else {
if (!asyncTask(
[](RzCore *core) {
rz_cons_break_push(reinterpret_cast<RzConsBreak>(rz_debug_stop), core->dbg);
rz_cons_break_push(
[](void *x) { rz_debug_stop(reinterpret_cast<RzDebug *>(x)); },
core->dbg);
rz_reg_arena_swap(core->dbg->reg, true);
rz_debug_continue_syscalls(core->dbg, NULL, 0);
rz_cons_break_pop();
@ -2681,8 +2683,8 @@ void CutterCore::addBreakpoint(const BreakpointDescription &config)
moduleNameData = config.positionExpression.toUtf8();
module = moduleNameData.data();
}
breakpoint = rz_debug_bp_add(core->dbg, address, (config.hw && watchpoint_prot == 0),
watchpoint_prot, watchpoint_prot, module, config.moduleDelta);
breakpoint = rz_debug_bp_add(core->dbg, address, config.size, config.hw, (watchpoint_prot != 0),
watchpoint_prot, module, config.moduleDelta);
if (!breakpoint) {
QMessageBox::critical(nullptr, tr("Breakpoint error"), tr("Failed to create breakpoint"));
return;
@ -3107,16 +3109,14 @@ QList<ImportDescription> CutterCore::getAllImports()
if (!bf) {
return {};
}
const RzList *imports = rz_bin_object_get_imports(bf->o);
const auto *imports = new CutterPVector<RzBinImport>(rz_bin_object_get_imports(bf->o));
if (!imports) {
return {};
}
QList<ImportDescription> qList;
RzBinImport *import;
RzListIter *iter;
bool va = core->io->va || core->bin->is_debugger;
CutterRzListForeach (imports, iter, RzBinImport, import) {
for (auto import : *imports) {
if (RZ_STR_ISEMPTY(import->name)) {
continue;
}