-
Notifications
You must be signed in to change notification settings - Fork 571
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
i#774 x64 reachability: extend reachability to out-of-line helper cal…
…ls (#2564) Applies DR_CLEANCALL_INDIRECT to out-of-line helper calls. Removes the hardcoded direct calls used for out-of-line clean call setup and cleanup code and replaces with insert_reachable_cti(). Fixes vmcode_unreachable_pc() to avoid a wraparound issue. Adds a test where a client generates a clean call into custom non-code-cache memory.
- Loading branch information
1 parent
388fa09
commit 77899b0
Showing
10 changed files
with
151 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* ********************************************************** | ||
| * Copyright (c) 2017 Google, Inc. All rights reserved. | ||
| * **********************************************************/ | ||
|
|
||
| /* | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * | ||
| * * Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * * Neither the name of Google, Inc. nor the names of its contributors may be | ||
| * used to endorse or promote products derived from this software without | ||
| * specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR CONTRIBUTORS BE LIABLE | ||
| * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | ||
| * DAMAGE. | ||
| */ | ||
|
|
||
| #include "dr_api.h" | ||
|
|
||
| #define PRE instrlist_meta_preinsert | ||
|
|
||
| #define GENCODE_SIZE 4096 | ||
|
|
||
| static app_pc gencode; | ||
| static bool used_gencode; | ||
|
|
||
| static void | ||
| clean_call(int arg) | ||
| { | ||
| dr_fprintf(STDERR, "inside clean call arg=%d\n", arg); | ||
| } | ||
|
|
||
| static dr_emit_flags_t | ||
| event_bb(void *dc, void *tag, instrlist_t *bb, bool for_trace, bool translating) | ||
| { | ||
| if (!used_gencode) { /* We assume a single-threaded app. */ | ||
| instr_t *where = instrlist_first(bb); | ||
| instr_t *ret_label = INSTR_CREATE_label(dc); | ||
| dr_save_reg(dc, bb, where, DR_REG_XAX, SPILL_SLOT_1); | ||
| dr_save_reg(dc, bb, where, DR_REG_XDX, SPILL_SLOT_2); | ||
| PRE(bb, where, INSTR_CREATE_mov_imm(dc, opnd_create_reg(DR_REG_XAX), | ||
| opnd_create_instr(ret_label))); | ||
| instrlist_insert_mov_immed_ptrsz(dc, (ptr_int_t)gencode, | ||
| opnd_create_reg(DR_REG_XDX), bb, where, | ||
| NULL, NULL); | ||
| PRE(bb, where, INSTR_CREATE_jmp_ind(dc, opnd_create_reg(DR_REG_XDX))); | ||
| PRE(bb, where, ret_label); | ||
| dr_restore_reg(dc, bb, where, DR_REG_XDX, SPILL_SLOT_2); | ||
| dr_restore_reg(dc, bb, where, DR_REG_XAX, SPILL_SLOT_1); | ||
| used_gencode = true; | ||
| } | ||
| return DR_EMIT_DEFAULT; | ||
| } | ||
|
|
||
| static void | ||
| event_exit(void) | ||
| { | ||
| dr_nonheap_free(gencode, GENCODE_SIZE); | ||
| } | ||
|
|
||
| DR_EXPORT void | ||
| dr_init(client_id_t id) | ||
| { | ||
| /* Use some API routines in non-code-cache code to test reachability. */ | ||
| void *dc = dr_get_current_drcontext(); | ||
| instrlist_t *ilist = instrlist_create(dc); | ||
| dr_insert_clean_call_ex(dc, ilist, NULL, (void *)clean_call, | ||
| DR_CLEANCALL_ALWAYS_OUT_OF_LINE|DR_CLEANCALL_INDIRECT, 1, | ||
| /* Pass a magic value we'll check in the template */ | ||
| OPND_CREATE_INT32(42)); | ||
| /* Now return */ | ||
| PRE(ilist, NULL, INSTR_CREATE_jmp_ind(dc, opnd_create_reg(DR_REG_XAX))); | ||
| gencode = dr_raw_mem_alloc(GENCODE_SIZE, | ||
| DR_MEMPROT_READ|DR_MEMPROT_WRITE|DR_MEMPROT_EXEC, NULL); | ||
| instrlist_encode(dc, ilist, gencode, false /*no relative jumps*/); | ||
| instrlist_clear_and_destroy(dc, ilist); | ||
|
|
||
| dr_register_bb_event(event_bb); | ||
| dr_register_exit_event(event_exit); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| inside clean call arg=42 | ||
| Hello, world! |