op_helper: switch to symb mode in fxrstor on symbolic data

Signed-off-by: Vitaly Chipounov <vitaly@cyberhaven.io>
shadowPlusPlus · May 23, 2019 · 5e4ee0b · 5e4ee0b
1 parent 01eec93
commit 5e4ee0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/include/cpu/se_libcpu.h b/include/cpu/se_libcpu.h
@@ -118,6 +118,7 @@ struct se_libcpu_interface_t {
         uint64_t (*read_mem_io_vaddr)(int masked);
         int (*is_port_symbolic)(uint64_t port);
         int (*is_mmio_symbolic)(uint64_t phys_addr, unsigned size);
+        int (*is_vmem_symbolic)(uint64_t vaddr, unsigned size);
 
         uintptr_t (*get_host_address)(uint64_t paddr);
 

diff --git a/src/target-i386/op_helper.c b/src/target-i386/op_helper.c
@@ -4623,6 +4623,12 @@ void helper_fxrstor(target_ulong ptr, int data64) {
         raise_exception(EXCP0D_GPF);
     }
 
+#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB)
+    if (g_sqi.mem.is_vmem_symbolic(ptr, 0x200)) {
+        g_sqi.exec.switch_to_symbolic(GETPC());
+    }
+#endif
+
     FPUC_W(lduw(ptr));
     fpus = lduw(ptr + 2);
     fptag = lduw(ptr + 4);