From e22133d3f8b1cb47750e4c66b46dfd90d3f2a036 Mon Sep 17 00:00:00 2001 From: silverweed Date: Fri, 26 Jul 2024 16:05:04 +0200 Subject: [PATCH] fix base_display_addr --- src/render.cpp | 10 +++++----- src/render.h | 2 -- src/rntviewer.cpp | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/render.cpp b/src/render.cpp index 6d2f22d..f83825c 100644 --- a/src/render.cpp +++ b/src/render.cpp @@ -31,7 +31,7 @@ internal u32 mem_edit_bg_color_fn(const u8 *, u64 off, void *user_data) { App_State *app = reinterpret_cast(user_data); - off += app->viewer.base_display_addr; + off += app->base_display_addr; i64 hilite_cluster = app->viewer.highlight_cluster ? app->viewer.highlighted_cluster : -1; Section section = find_section(*app, off, hilite_cluster); @@ -194,11 +194,11 @@ void update_and_render(Arena *arena, App_State &app, f32 delta_time_ms) ImGui::TableNextColumn(); - assert(app.viewer.base_display_addr < app.inspected_file.size); - void *content = app.inspected_file.mem + app.viewer.base_display_addr; - u64 content_size = app.inspected_file.size - app.viewer.base_display_addr; + assert(app.base_display_addr < app.inspected_file.size); + void *content = app.inspected_file.mem + app.base_display_addr; + u64 content_size = app.inspected_file.size - app.base_display_addr; app.last_pinfo = &invalid_pinfo; - app.viewer.mem_edit.DrawContents(content, content_size, app.viewer.base_display_addr); + app.viewer.mem_edit.DrawContents(content, content_size, app.base_display_addr); ImGui::TableNextColumn(); ImGuiColorEditFlags flags = ImGuiColorEditFlags_NoInputs|ImGuiColorEditFlags_NoLabel; diff --git a/src/render.h b/src/render.h index 5e68269..e48fe53 100644 --- a/src/render.h +++ b/src/render.h @@ -10,8 +10,6 @@ struct Viewer { f32 col_highlight[3]; f32 col_page_start[3]; - u64 base_display_addr; - b8 highlight_cluster; u64 highlighted_cluster; diff --git a/src/rntviewer.cpp b/src/rntviewer.cpp index c79fbeb..a881297 100644 --- a/src/rntviewer.cpp +++ b/src/rntviewer.cpp @@ -115,6 +115,7 @@ int main(int argc, char **argv) } app.ntpl_name = args.ntpl_name; + app.base_display_addr = args.start_addr; app.tfile_data = get_tfile_data(app.inspected_file); app.rndata = get_rntuple_data(arena, app.inspected_file, app.ntpl_name); @@ -142,7 +143,6 @@ int main(int argc, char **argv) } make_viewer(app, args.n_cols); - app.viewer.base_display_addr = args.start_addr; // Start main loop run_main_loop(window, arena, app);