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

Update Rizin version (#2698)

Browse Source
This commit is contained in:
xarkes 2021-06-04 11:05:34 +02:00 committed by GitHub
parent 26c9dcc76c
commit bc57167534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/BundledRizin.cmake
View File

@ -48,7 +48,7 @@ endif()
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_asm rz_debug
rz_hash rz_bin rz_lang rz_io rz_analysis rz_parse rz_bp rz_egg rz_reg rz_hash rz_bin rz_lang rz_io rz_analysis rz_parse rz_bp rz_egg rz_reg
rz_search rz_syscall rz_socket rz_magic rz_crypto) rz_search rz_syscall rz_socket rz_magic rz_crypto rz_type)
set (RZ_EXTRA_LIBS rz_main) set (RZ_EXTRA_LIBS rz_main)
set (RZ_BIN rz-agent rz-bin rizin rz-diff rz-find rz-gg rz-hash rz-run rz-asm rz-ax) set (RZ_BIN rz-agent rz-bin rizin rz-diff rz-find rz-gg rz-hash rz-run rz-asm rz-ax)

3
cmake/FindRizin.cmake
View File

@ -53,7 +53,8 @@ if(WIN32)
syscall syscall
socket socket
magic magic
crypto) crypto
type)
set(Rizin_LIBRARIES "") set(Rizin_LIBRARIES "")
set(Rizin_LIBRARIES_VARS "") set(Rizin_LIBRARIES_VARS "")

3
dist/CMakeLists.txt vendored
View File

@ -109,7 +109,8 @@ if(CUTTER_PACKAGE_RZ_GHIDRA)
# installed Cutter. # installed Cutter.
ExternalProject_Add(rz-ghidra ExternalProject_Add(rz-ghidra
GIT_REPOSITORY https://github.com/rizinorg/rz-ghidra GIT_REPOSITORY https://github.com/rizinorg/rz-ghidra
GIT_TAG v0.2.0 #GIT_TAG v0.2.0
GIT_TAG dev
#GIT_SHALLOW ON # disable this line when using commit hash #GIT_SHALLOW ON # disable this line when using commit hash
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""

2
rizin

@ -1 +1 @@
Subproject commit 91d3bb43fd92fc04e8def76beb22c2d84ae53fb5 Subproject commit e60f06775ebffc7e91903d0b21ad8fee1c86c1ac

33
src/core/Cutter.cpp
View File

@ -659,7 +659,7 @@ bool CutterCore::tryFile(QString path, bool rw)
return false; return false;
} }
rz_core_file_close(core, cf); rz_core_file_close(cf);
return true; return true;
} }
@ -2873,23 +2873,20 @@ QList<RelocDescription> CutterCore::getAllRelocs()
QList<RelocDescription> ret; QList<RelocDescription> ret;
if (core && core->bin && core->bin->cur && core->bin->cur->o) { if (core && core->bin && core->bin->cur && core->bin->cur->o) {
auto relocs = core->bin->cur->o->relocs; auto relocs = rz_bin_object_patch_relocs(core->bin->cur, core->bin->cur->o);
RBIter iter; for (size_t i = 0; i < relocs->relocs_count; i++) {
RzBinReloc *br; RzBinReloc *reloc = relocs->relocs[i];
rz_rbtree_foreach(relocs, iter, br, RzBinReloc, vrb) RelocDescription desc;
{ desc.vaddr = reloc->vaddr;
RelocDescription reloc; desc.paddr = reloc->paddr;
desc.type = (reloc->additive ? "ADD_" : "SET_") + QString::number(reloc->type);
reloc.vaddr = br->vaddr; if (reloc->import)
reloc.paddr = br->paddr; desc.name = reloc->import->name;
reloc.type = (br->additive ? "ADD_" : "SET_") + QString::number(br->type);
if (br->import)
reloc.name = br->import->name;
else else
reloc.name = QString("reloc_%1").arg(QString::number(br->vaddr, 16)); desc.name = QString("reloc_%1").arg(QString::number(reloc->vaddr, 16));
ret << reloc; ret << desc;
} }
} }
@ -3481,7 +3478,7 @@ QString CutterCore::addTypes(const char *str)
{ {
CORE_LOCK(); CORE_LOCK();
char *error_msg = nullptr; char *error_msg = nullptr;
char *parsed = rz_parse_c_string(core->analysis, str, &error_msg); char *parsed = rz_type_parse_c_string(core->analysis->typedb, str, &error_msg);
QString error; QString error;
if (!parsed) { if (!parsed) {
@ -3492,7 +3489,7 @@ QString CutterCore::addTypes(const char *str)
return error; return error;
} }
rz_analysis_save_parsed_type(core->analysis, parsed); rz_type_db_save_parsed_type(core->analysis->typedb, parsed);
rz_mem_free(parsed); rz_mem_free(parsed);
if (error_msg) { if (error_msg) {
@ -3922,7 +3919,7 @@ QString CutterCore::getVersionInformation()
{ "rz_crypto", &rz_crypto_version }, { "rz_crypto", &rz_crypto_version },
{ "rz_bp", &rz_bp_version }, { "rz_bp", &rz_bp_version },
{ "rz_debug", &rz_debug_version }, { "rz_debug", &rz_debug_version },
{ "rz_hash", &rz_hash_version }, { "rz_msg_digest", &rz_msg_digest_version },
{ "rz_io", &rz_io_version }, { "rz_io", &rz_io_version },
#if !USE_LIB_MAGIC #if !USE_LIB_MAGIC
{ "rz_magic", &rz_magic_version }, { "rz_magic", &rz_magic_version },