From ff1774d561362f35b2b6f8e95241495fd2016ea7 Mon Sep 17 00:00:00 2001 From: Sergej Schumilo Date: Tue, 11 Jan 2022 02:58:01 +0100 Subject: [PATCH] remove dead code --- nyx/fast_vm_reload.c | 35 --------------------------- nyx/snapshot/memory/backend/nyx_fdl.c | 26 -------------------- 2 files changed, 61 deletions(-) diff --git a/nyx/fast_vm_reload.c b/nyx/fast_vm_reload.c index c6100e327b..50be74bb0e 100644 --- a/nyx/fast_vm_reload.c +++ b/nyx/fast_vm_reload.c @@ -123,41 +123,6 @@ static void fast_snapshot_init_operation(fast_reload_t* self, const char* snapsh } } -static void fast_snapshot_init_from_snapshot_operation(fast_reload_t* self, const char* folder){ - - self->device_state = nyx_device_state_init(); - - self->shadow_memory_state = shadow_memory_init(); - - switch(mode){ - case RELOAD_MEMORY_MODE_DEBUG: - break; - case RELOAD_MEMORY_MODE_DEBUG_QUIET: - break; - case RELOAD_MEMORY_MODE_FDL: - self->fdl_state = nyx_fdl_init(self->shadow_memory_state); - break; - case RELOAD_MEMORY_MODE_FDL_DEBUG: - self->fdl_state = nyx_fdl_init(self->shadow_memory_state); - break; - case RELOAD_MEMORY_MODE_DIRTY_RING: - self->dirty_ring_state = nyx_dirty_ring_init(self->shadow_memory_state); - break; - case RELOAD_MEMORY_MODE_DIRTY_RING_DEBUG: - self->dirty_ring_state = nyx_dirty_ring_init(self->shadow_memory_state); - break; - } - - self->fdl_user_state = nyx_fdl_user_init(self->shadow_memory_state); - - nyx_fdl_user_enable(self->fdl_user_state); - - self->block_state = nyx_block_snapshot_init(); - - memory_global_dirty_log_start(); - self->root_snapshot_created = true; -} - static void fast_snapshot_restore_operation(fast_reload_t* self){ switch(mode){ diff --git a/nyx/snapshot/memory/backend/nyx_fdl.c b/nyx/snapshot/memory/backend/nyx_fdl.c index 169ac5923c..b1b21c2a69 100644 --- a/nyx/snapshot/memory/backend/nyx_fdl.c +++ b/nyx/snapshot/memory/backend/nyx_fdl.c @@ -95,32 +95,6 @@ nyx_fdl_t* nyx_fdl_init(shadow_memory_t* shadow_memory){ return self; } - -/* TODO? */ -static void nyx_snapshot_nyx_fdl_unset_blocklisted_pages(nyx_fdl_t* self, shadow_memory_t* shadow_memory_state, snapshot_page_blocklist_t* blocklist){ - - for(uint32_t i = 0; i < blocklist->pages_num; i++){ - //cpu_physical_memory_test_and_clear_dirty(base_offset+self->black_list_pages[i], TARGET_PAGE_SIZE, DIRTY_MEMORY_MIGRATION); - - if(blocklist->pages[i] >= MEM_SPLIT_START){ - - - uint64_t offset_addr = blocklist->pages[i]-MEM_SPLIT_START; - - //fprintf(stderr, "%s: %lx -> %lx\n", __func__, self->black_list_pages[i], offset_addr); - //abort(); - clear_bit((long)offset_addr>>12, (unsigned long *)self->entry[1].bitmap); - //clear_bit((long)offset_addr>>12, (unsigned long *)self->fdl_data2.entry[1].fdl_user_bitmap); - } - else{ - uint64_t offset_addr = blocklist->pages[i]; - - clear_bit((long)offset_addr>>12, (unsigned long *)self->entry[0].bitmap); - //clear_bit((long)offset_addr>>12, (unsigned long *)self->fdl_data2.entry[0].fdl_user_bitmap); - } - } -} - #define MEMSET_BITMAP #ifdef MEMSET_BITMAP