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

Update Rizin to the latest dev (#3319)

Browse Source
This commit is contained in:
Anton Kochkov 2024-03-19 17:51:58 +08:00 committed by GitHub
parent 43950242ae
commit f8c7df8260
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/BundledRizin.cmake
View File

@ -59,10 +59,9 @@ endif()
# instead of being hardcoded. # instead of being hardcoded.
set (Rizin_VERSION 0.8) set (Rizin_VERSION 0.8)
set (RZ_LIBS rz_core rz_config rz_cons rz_io rz_util rz_flag rz_asm rz_debug set (RZ_LIBS rz_core rz_config rz_cons rz_io rz_util rz_flag rz_arch rz_debug
rz_hash rz_bin rz_lang rz_il rz_analysis rz_parse rz_bp rz_egg rz_reg rz_hash rz_bin rz_lang rz_il rz_bp rz_egg rz_reg rz_search rz_syscall
rz_search rz_syscall rz_socket rz_magic rz_crypto rz_type rz_diff rz_sign rz_socket rz_magic rz_crypto rz_type rz_diff rz_sign rz_demangler)
rz_demangler)
set (RZ_EXTRA_LIBS rz_main) set (RZ_EXTRA_LIBS rz_main)
set (RZ_BIN rz-bin rizin rz-diff rz-find rz-gg rz-hash rz-run rz-asm rz-ax) set (RZ_BIN rz-bin rizin rz-diff rz-find rz-gg rz-hash rz-run rz-asm rz-ax)

2
rizin

@ -1 +1 @@
Subproject commit 4a0dca66131de65ca10679e42e3adb5d39735ffa Subproject commit 94099b860e6ce712e337e9ee29d258d51ae32962

10
src/core/Cutter.cpp
View File

@ -1295,7 +1295,7 @@ RVA CutterCore::getLastFunctionInstruction(RVA addr)
if (!fcn) { if (!fcn) {
return RVA_INVALID; return RVA_INVALID;
} }
RzAnalysisBlock *lastBB = (RzAnalysisBlock *)rz_list_last(fcn->bbs); RzAnalysisBlock *lastBB = (RzAnalysisBlock *)rz_pvector_tail(fcn->bbs);
return lastBB ? rz_analysis_block_get_op_addr(lastBB, lastBB->ninstr - 1) : RVA_INVALID; return lastBB ? rz_analysis_block_get_op_addr(lastBB, lastBB->ninstr - 1) : RVA_INVALID;
} }
@ -1641,7 +1641,7 @@ QVector<Chunk> CutterCore::getHeapChunks(RVA arena_addr)
rz_list_free(arenas); rz_list_free(arenas);
return chunks_vector; return chunks_vector;
} }
m_arena = ((RzArenaListItem *)rz_list_get_head_data(arenas))->addr; m_arena = ((RzArenaListItem *)rz_list_first(arenas))->addr;
rz_list_free(arenas); rz_list_free(arenas);
} else { } else {
m_arena = arena_addr; m_arena = arena_addr;
@ -3061,7 +3061,7 @@ QList<FunctionDescription> CutterCore::getAllFunctions()
function.linearSize = rz_analysis_function_linear_size(fcn); function.linearSize = rz_analysis_function_linear_size(fcn);
function.nargs = rz_analysis_arg_count(fcn); function.nargs = rz_analysis_arg_count(fcn);
function.nlocals = rz_analysis_var_local_count(fcn); function.nlocals = rz_analysis_var_local_count(fcn);
function.nbbs = rz_list_length(fcn->bbs); function.nbbs = rz_pvector_len(fcn->bbs);
function.calltype = fcn->cc ? QString::fromUtf8(fcn->cc) : QString(); function.calltype = fcn->cc ? QString::fromUtf8(fcn->cc) : QString();
function.name = fcn->name ? QString::fromUtf8(fcn->name) : QString(); function.name = fcn->name ? QString::fromUtf8(fcn->name) : QString();
function.edges = rz_analysis_function_count_edges(fcn, nullptr); function.edges = rz_analysis_function_count_edges(fcn, nullptr);
@ -4334,10 +4334,9 @@ QString CutterCore::getVersionInformation()
const char *name; const char *name;
const char *(*callback)(); const char *(*callback)();
} vcs[] = { } vcs[] = {
{ "rz_analysis", &rz_analysis_version }, { "rz_arch", &rz_arch_version },
{ "rz_lib", &rz_lib_version }, { "rz_lib", &rz_lib_version },
{ "rz_egg", &rz_egg_version }, { "rz_egg", &rz_egg_version },
{ "rz_asm", &rz_asm_version },
{ "rz_bin", &rz_bin_version }, { "rz_bin", &rz_bin_version },
{ "rz_cons", &rz_cons_version }, { "rz_cons", &rz_cons_version },
{ "rz_flag", &rz_flag_version }, { "rz_flag", &rz_flag_version },
@ -4350,7 +4349,6 @@ QString CutterCore::getVersionInformation()
#if !USE_LIB_MAGIC #if !USE_LIB_MAGIC
{ "rz_magic", &rz_magic_version }, { "rz_magic", &rz_magic_version },
#endif #endif
{ "rz_parse", &rz_parse_version },
{ "rz_reg", &rz_reg_version }, { "rz_reg", &rz_reg_version },
{ "rz_sign", &rz_sign_version }, { "rz_sign", &rz_sign_version },
{ "rz_search", &rz_search_version }, { "rz_search", &rz_search_version },

2
src/widgets/DisassemblerGraphView.cpp
View File

@ -225,7 +225,7 @@ void DisassemblerGraphView::loadCurrentGraph()
return; return;
} }
for (const auto &bbi : CutterRzList<RzAnalysisBlock>(fcn->bbs)) { for (const auto &bbi : CutterPVector<RzAnalysisBlock>(fcn->bbs)) {
RVA bbiFail = bbi->fail; RVA bbiFail = bbi->fail;
RVA bbiJump = bbi->jump; RVA bbiJump = bbi->jump;