i#2144: setting exit reason the same way

DynamoRIO · May 10, 2017 · 9a1826e · 9a1826e
1 parent 892513a
commit 9a1826e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/core/arch/arch.h b/core/arch/arch.h
@@ -483,7 +483,7 @@ mangle_interrupt(dcontext_t *dcontext, instrlist_t *ilist, instr_t *instr,
 void
 mangle_possible_single_step(dcontext_t *dcontext, instrlist_t *ilist, instr_t *instr);
 void
-mangle_single_step(dcontext_t *dcontext, instrlist_t *ilist, instr_t *instr);
+mangle_single_step(dcontext_t *dcontext, instrlist_t *ilist, uint flags, instr_t *instr);
 
 #endif
 instr_t *

diff --git a/core/arch/mangle_shared.c b/core/arch/mangle_shared.c
@@ -1003,7 +1003,7 @@ mangle(dcontext_t *dcontext, instrlist_t *ilist, uint *flags INOUT,
         }
         else if (dcontext->single_step_addr != NULL &&
                  dcontext->single_step_addr == instr->translation) {
-            mangle_single_step(dcontext, ilist, instr);
+            mangle_single_step(dcontext, ilist, *flags, instr);
             /* Resets to generate single step exception only once. */
             dcontext->single_step_addr = NULL;
         }

diff --git a/core/arch/x86/mangle.c b/core/arch/x86/mangle.c
@@ -2415,16 +2415,24 @@ mangle_possible_single_step(dcontext_t *dcontext, instrlist_t *ilist,
  * Single step exceptions generation
  */
 void
-mangle_single_step(dcontext_t *dcontext, instrlist_t *ilist, instr_t *instr)
+mangle_single_step(dcontext_t *dcontext, instrlist_t *ilist, uint flags,
+                   instr_t *instr)
 {
     /* Sets exit reason dynamically. */
-    insert_shared_get_dcontext(dcontext, ilist, instr, true/*save_xdi*/);
-    PRE(ilist, instr, INSTR_CREATE_mov_st
-        (dcontext,
-         opnd_create_dcontext_field_via_reg_sz(dcontext, REG_NULL/*default*/,
-                                               EXIT_REASON_OFFSET, OPSZ_2),
-         OPND_CREATE_INT16(EXIT_REASON_SINGLE_STEP)));
-    insert_shared_restore_dcontext_reg(dcontext, ilist, instr);
+    if (DYNAMO_OPTION(private_ib_in_tls) || TEST(FRAG_SHARED, flags)) {
+        insert_shared_get_dcontext(dcontext, ilist, instr, true/*save_xdi*/);
+        PRE(ilist, instr, INSTR_CREATE_mov_st
+            (dcontext,
+             opnd_create_dcontext_field_via_reg_sz(dcontext, REG_NULL/*default*/,
+                                                   EXIT_REASON_OFFSET, OPSZ_2),
+             OPND_CREATE_INT16(EXIT_REASON_SINGLE_STEP)));
+        insert_shared_restore_dcontext_reg(dcontext, ilist, instr);
+    } else {
+        PRE(ilist, instr,
+            instr_create_save_immed16_to_dcontext(dcontext,
+                                                  EXIT_REASON_SINGLE_STEP,
+                                                  EXIT_REASON_OFFSET));
+    }
 }
 
 /***************************************************************************