Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RzSearch refactor #4762

Draft
wants to merge 9 commits into
base: dev
Choose a base branch
from
+2,344 −1,121
Draft

RzSearch refactor #4762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f34566
Sorry mister, we don't do search no longer.
Rot127 Dec 10, 2024
10c86ed
Add RzShell handlers for all search commands.
Rot127 Dec 10, 2024
098c69f
Import new RzSearch from reference branch.
Rot127 Dec 11, 2024
bb92f14
Unfinished reimplementation of /x.
Rot127 Dec 11, 2024
9e83ec5
Fix up the hex string to buffer functions.
Rot127 Dec 13, 2024
6679561
Fix fast mask comparison macro.
Rot127 Dec 13, 2024
6419d9d
Fix byte comparison with UB.
Rot127 Dec 13, 2024
7e710dc
Invert condition to match documentation of callback
Rot127 Dec 13, 2024
f05f421
Handle search options from the settings and add tests.
Rot127 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions librz/core/cconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,16 @@ static bool cb_str_search_max_threads(void *user, void *data) {
return true;
}

static bool cb_search_max_threads(void *user, void *data) {
RzConfigNode *node = (RzConfigNode *)data;
RzThreadNCores max_threads = rz_th_max_threads(node->i_value);
if (node->value[0] == '?') {
rz_cons_printf("%d\n", max_threads);
return false;
}
return true;
}

static bool cb_str_search_min_length(void *user, void *data) {
RzCore *core = (RzCore *)user;
RzConfigNode *node = (RzConfigNode *)data;
Expand Down Expand Up @@ -2430,6 +2440,16 @@ static bool cb_searchalign(void *user, void *data) {
return true;
}

static bool cb_searchalignment(void *user, void *data) {
RzConfigNode *node = (RzConfigNode *)data;
ut64 alignment = node->i_value;
if (alignment >= 64 || alignment < 1) {
RZ_LOG_ERROR("Alignment has to be between 1-63.\n");
return false;
}
return true;
}

static bool cb_segoff(void *user, void *data) {
RzCore *core = (RzCore *)user;
RzConfigNode *node = (RzConfigNode *)data;
Expand Down Expand Up @@ -3757,14 +3777,7 @@ RZ_API int rz_core_config_init(RzCore *core) {
SETOPTIONS(n, "auto", "rosections", "raw", NULL);

/* search */
SETCB("search.contiguous", "true", &cb_contiguous, "Accept contiguous/adjacent search hits");
SETICB("search.align", 0, &cb_searchalign, "Only catch aligned search hits");
SETI("search.chunk", 0, "Chunk size for /+ (default size is asm.bits/8");
SETI("search.esilcombo", 8, "Stop search after N consecutive hits");
SETI("search.distance", 0, "Search string distance");
SETBPREF("search.flags", "true", "All search results are flagged, otherwise only printed");
SETBPREF("search.overlap", "false", "Look for overlapped search hits");
SETI("search.maxhits", 0, "Maximum number of hits (0: no limit)");
SETICB("search.max_threads", RZ_THREAD_N_CORES_ALL_AVAILABLE, &cb_search_max_threads, "Maximum core number. '0' for all cores. '?' to show available.");
SETI("search.from", 0, "Search start address");
SETI("search.to", UT64_MAX, "Search end address");
n = NODECB("search.in", "io.maps", &cb_search_in);
Expand All @@ -3776,10 +3789,19 @@ RZ_API int rz_core_config_init(RzCore *core) {
"dbg.map", "dbg.maps", "dbg.maps.rwx", "dbg.maps.r", "dbg.maps.rw", "dbg.maps.rx", "dbg.maps.wx", "dbg.maps.x",
"analysis.fcn", "analysis.bb",
NULL);
SETICB("search.kwidx", 0, &cb_search_kwidx, "Store last search index count");
SETPREF("search.prefix", "hit", "Prefix name in search hits label");
SETI("search.maxhits", 0, "Maximum number of hits ('0' means no limit)");
SETBPREF("search.show_progress", "true", "Show the search process.");
SETBPREF("search.overlap", "true", "Look for overlapped search hits.");
SETICB("search.io.alignment", 1, &cb_searchalignment, "Only search at set byte alignment.");

SETICB("search.align", 0, &cb_searchalign, "Only catch aligned search hits");
SETI("search.chunk", 0, "Chunk size for /+ (default size is asm.bits/8");
SETI("search.esilcombo", 8, "Stop search after N consecutive hits");
SETI("search.distance", 0, "Search string distance");
SETBPREF("search.flags", "true", "All search results are flagged, otherwise only printed");
SETICB("search.kwidx", 0, &cb_search_kwidx, "Store last search index count");
SETBPREF("search.show", "true", "Show search results");
SETI("search.to", -1, "Search end address");
n = NODECB("search.case_sensitive", "smart", &cb_search_case_sensitive);
SETDESC(n, "Set grep(~) as case smart/sensitive/insensitive");
SETOPTIONS(n, "smart", "sensitive", "insensitive", NULL);
Expand Down
Loading
Loading