DynamoRIO/dynamorio
1
0
Fork 0
mirror of https://github.com/DynamoRIO/dynamorio.git synced 2026-10-12 02:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

i#2924 VS2017: Switch Appveyor to VS2017 (#3999)

Browse Source 
Changes Appveyor to use VS2017 instead of VS2013.  We no longer officially
maintain VS2013 support.

Includes quite a few small fixes to get all builds and as many tests as possible passing on VS2017 and Win10-1607 on Appveyor:
+ Add VS2017 support to x64 LIB env var swapping
+ Add pseudo-dll mapping for Ext-MS-Win-NtUser-* and API-MS-Win-RtCore-NtUser-*
+ Increase drmarker cmd size
+ Avoid crashing in debug-only code if PEB.KernelCallbackTable is NULL
+ Expand win32.fpe allowed output to include 'inf' for DBL_MAX+DBL_MAX
+ Pass /arch:IA32 /MD to tool.cpuid.exe to keep drcpusim tests passing w/o any new opcodes
+#4056 drsyms: allow either order of args in output; allow an extra leading underscore; allow a too-long name_available_size; give up on types matching given all the weirdness in recent dbghelps
+ client.fibers fixes for VS2017:
  + Delete the main fiber on exit, since the deletion callback is not called natively
    with VS2017 otherwise.
  + Increase the max FLS slot limit to match pre-Win10.
  + Allow either order of deletion callbacks.
+ client.winxfer test:
  + Allow variations in event counts
  + Remove #4053 assert on un-suspendable un-scheduled attach thread
    since it happens on win10 at exit and is not fatal
+ Fix unit_tests problems:
  + Set -msgbox_mask to 0 to avoid hangs
  + Skip static TLS from #4030 since it leads to asserts in the
    LoadLibrary unit tests b/c we don't support TLS in later-loaded libs
  + Fix exit-time crashes by always swapping the PEB and swapping back at
    the end of the drwinapi tests.
* Add an AUTOMATED_TESTING cmake and cpp define, set it for arg_travis
in runsuite.cmake, and use it to make -msgbox_mask 0 by default, as a
failsafe to avoid hangs in CI.
+ Use a better dbghelp:
  + Update search paths: use ProgFiles(x86) instead of PROGFILES.
  + Have drsyms make a local copy in ext/lib64/debug.
+ i#4057: Copy CTest xml files manually
  CMake 3.14 dropped support for copying xml results locally.
  We solve that by manually copying them ourselves.
+ Fix VPS build warnings with VS2017 and from #4050 and #4053
+ Switch to regular FindMFC; fix DRstats build warnings on VS2017
+ Disable MSVC popups in drcachesim's launcher to avoid hanging Appveyor
+ Ignore the remaining VS2017 test failures, leaving fixing those to #4058 

Issue: #4030, #4053, #4001, #4058
Fixes #2924
Fixes #4056
Fixes #4057
This commit is contained in:
Derek Bruening
2020-01-27 00:46:59 -05:00
committed by GitHub
parent ace83ff936
commit aab2df6993
31 changed files with 270 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.appveyor.yml
+5 -6
View File
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2017-2018 Google, Inc. All rights reserved.
# Copyright (c) 2017-2019 Google, Inc. All rights reserved.
# **********************************************************
# Redistribution and use in source and binary forms, with or without
@@ -53,16 +53,15 @@ branches:
platform: x64
image: Visual Studio 2013
image: Visual Studio 2017
build:
verbosity: detailed
# i#2406: Appveyor's global serialization makes it painful to use more than
# one configuration. We no longer build packages with VS2010 and are
# dropping official support for it, meaning we only need to test VS2013 here.
# one configuration. We thus officially only support a single VS version.
configuration:
- 2013
- 2017
install:
##################################################
@@ -92,7 +91,7 @@ install:
# XXX i#2145: point at Qt5 for testing drgui build.
before_build:
- if "%configuration%"=="2013" call "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
- if "%configuration%"=="2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
- cd c:\projects\dynamorio
build_script:
CMakeLists.txt
+12 -2
View File
@@ -1366,7 +1366,10 @@ endmacro(DR_export_target)
# We locate it here for use in both subdirs.
if (X64)
set(PROGFILES "$ENV{PROGRAMW6432}") # cmake is 32-bit
set(PROGFILES32 "$ENV{PROGRAMFILES}")
set(PROGFILES32 "$ENV{ProgramFiles\(x86\)}")
if ("${PROGFILES32}" STREQUAL "")
set(PROGFILES32 "$ENV{PROGRAMFILES}")
endif ()
set(ARCH_SFX "x64")
else (X64)
set(PROGFILES "$ENV{PROGRAMFILES}")
@@ -1374,6 +1377,7 @@ else (X64)
set(ARCH_SFX "x86")
endif (X64)
set(dbghelp_paths
"${PROGFILES32}/Microsoft Visual Studio/*/Professional/Common7/IDE/Remote Debugger/${ARCH_SFX}/dbghelp.dll"
"${PROGFILES}/Microsoft Visual Studio */Common7/IDE/Remote Debugger/${ARCH_SFX}/dbghelp.dll"
"${PROGFILES32}/Windows Kits/*/Debuggers/${ARCH_SFX}/dbghelp.dll")
if (X64)
@@ -1471,6 +1475,8 @@ endif (NOT CLIENT_INTERFACE)
# An alternative is to keep them in separate projects and only build
# when we run them via --build-and-test.
option(BUILD_TESTS "build tests" OFF)
# This is to disable the default -msgbox_mask.
option(AUTOMATED_TESTING "build for automated testing" OFF)
if (BUILD_TESTS)
# Tests require tools
set(BUILD_TOOLS ON)
@@ -1502,7 +1508,11 @@ endif (BUILD_TOOLS)
if (BUILD_DRSTATS)
# i#1376: we have our own variant of the standard FindMFC.cmake
# so we can pass -D_UNICODE, as MBCS MFC support is not part of VS2013.
find_package(MFCUnicode)
# Update: To get things going with VS2017 I'm switching to the regular one
# to get some version of DRstats building. We don't really use it much
# anymore; only if someone notices any unicode issues is it worth more time
# updating make/modules/FindMFCUnicode.cmake.
find_package(MFC)
if (NOT MFC_FOUND)
message(STATUS "MFC not found: disabling DRstats")
set(BUILD_DRSTATS OFF)
CTestConfig.cmake
+6 -14
View File
@@ -1,4 +1,5 @@
# **********************************************************
# Copyright (c) 2020 Google, Inc. All rights reserved.
# Copyright (c) 2009-2010 VMware, Inc. All rights reserved.
# **********************************************************
@@ -32,25 +33,16 @@
set(CTEST_PROJECT_NAME "DynamoRIO")
if (SUBMIT_LOCAL)
set(CTEST_DROP_METHOD "scp")
if (WIN32)
# Cygwin scp won't take : later in path (and interprets drive as host like
# unix scp would) so we use a batch file.
# Note that CTEST_SCP_COMMAND must be a single executable so we can't
# use "cmake -E copy". We could use cygwin "cp" but that requires cygwin.
set(CTEST_SCP_COMMAND "${CTEST_SCRIPT_DIRECTORY}/../make/copy.bat")
else (WIN32)
find_program(CTEST_SCP_COMMAND scp DOC "scp command for local copy of results")
endif (WIN32)
# There is no longer support for "cp" or "scp methods in cmake 3.14+: there is no
# way to copy locally using ctest_submit(). We copy ourselves manually.
set(CTEST_SUBMIT_URL "none")
set(CTEST_DROP_METHOD "none")
set(CTEST_TRIGGER_SITE "")
set(CTEST_DROP_SITE_USER "")
# CTest does "scp file ${CTEST_DROP_SITE}:${CTEST_DROP_LOCATION}" so for
# local copy w/o needing sshd on localhost we arrange to have : in the
# absolute filepath (when absolute, scp interprets as local even if : later)
if (NOT EXISTS "${CTEST_DROP_SITE}:${CTEST_DROP_LOCATION}")
message(FATAL_ERROR
"must set ${CTEST_DROP_SITE}:${CTEST_DROP_LOCATION} to an existing directory")
endif (NOT EXISTS "${CTEST_DROP_SITE}:${CTEST_DROP_LOCATION}")
endif ()
else (SUBMIT_LOCAL)
# Nightly runs will use sources as of this time
set(CTEST_NIGHTLY_START_TIME "04:00:00 EST")
clients/drcachesim/launcher.cpp
+8 -1
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2015-2019 Google, Inc. All rights reserved.
* Copyright (c) 2015-2020 Google, Inc. All rights reserved.
* **********************************************************/
/*
@@ -200,6 +200,13 @@ _tmain(int argc, const TCHAR *targv[])
// one, there's no problem to solve like the UNIX fifo file left
// behind. Two, the ^c handler in a new thread is more work to
// deal with as it races w/ the main thread.
# ifdef DEBUG
// Avoid pop-up messageboxes in tests.
if (!IsDebuggerPresent()) {
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
}
# endif
#endif
#if defined(WINDOWS) && !defined(_UNICODE)
core/hotpatch.c
+35 -35
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2011-2019 Google, Inc. All rights reserved.
* Copyright (c) 2011-2020 Google, Inc. All rights reserved.
* Copyright (c) 2005-2010 VMware, Inc. All rights reserved.
* **********************************************************/
@@ -604,7 +604,7 @@ hotp_dump_reg_state(const hotp_context_t *reg_state, const app_pc eip,
# endif
static void
hotp_only_inject_patch(const hotp_offset_match_t *ppoint_desc,
const thread_record_t **all_threads, const int num_threads);
const thread_record_t **thread_table, const int num_threads);
static void
hotp_only_remove_patch(dcontext_t *dcontext, const hotp_module_t *module,
hotp_patch_point_t *cur_ppoint);
@@ -1333,15 +1333,15 @@ hotp_read_policy_modes(hotp_policy_mode_t **old_modes)
*/
for (i = 0; i < num_mode_update_entries; i++) {
bool matched = false;
char *temp, *policy_id;
char *split, *policy_id;
SET_STR_PTR(policy_id, start);
temp = strchr(policy_id, ':');
if (temp == NULL)
split = strchr(policy_id, ':');
if (split == NULL)
goto error_reading_policy;
*temp++ = '\0'; /* TODO: during file mapping, this won't work */
*split++ = '\0'; /* TODO: during file mapping, this won't work */
SET_NUM(mode, uint, MODE, temp);
SET_NUM(mode, uint, MODE, split);
/* Must set mode for all vulnerabilities with a matching policy_id, not
* just the first one.
@@ -2043,16 +2043,16 @@ hotp_compute_hash(app_pc base, hotp_patch_point_hash_t *hash)
static void
hotp_process_image_helper(const app_pc base, const bool loaded,
const bool own_hot_patch_lock, const bool just_check,
bool *needs_processing, const thread_record_t **all_threads,
bool *needs_processing, const thread_record_t **thread_table,
const int num_threads, const bool ldr_safety,
vm_area_vector_t *toflush);
void
hotp_process_image(const app_pc base, const bool loaded, const bool own_hot_patch_lock,
const bool just_check, bool *needs_processing,
const thread_record_t **all_threads, const int num_threads)
const thread_record_t **thread_table, const int num_threads)
{
hotp_process_image_helper(base, loaded, own_hot_patch_lock, just_check,
needs_processing, all_threads, num_threads, false, NULL);
needs_processing, thread_table, num_threads, false, NULL);
}
/* Helper routine for seeing if point is in hotp_ppoint_vec */
@@ -2138,7 +2138,7 @@ hotp_perscache_overlap(uint vul, uint set, uint module, app_pc base, size_t imag
static void
hotp_process_image_helper(const app_pc base, const bool loaded,
const bool own_hot_patch_lock, const bool just_check,
bool *needs_processing, const thread_record_t **all_threads,
bool *needs_processing, const thread_record_t **thread_table,
const int num_threads_arg, const bool ldr_safety,
vm_area_vector_t *toflush)
{
@@ -2488,7 +2488,7 @@ hotp_process_image_helper(const app_pc base, const bool loaded,
hotp_ppoint_areas_add(&ppoint_desc);
if (DYNAMO_OPTION(hotp_only)) {
hotp_only_inject_patch(&ppoint_desc, all_threads,
hotp_only_inject_patch(&ppoint_desc, thread_table,
num_threads);
}
}
@@ -2727,7 +2727,7 @@ hotp_policy_list_exit:
*
*/
static void
hotp_walk_loader_list(thread_record_t **all_threads, const int num_threads,
hotp_walk_loader_list(thread_record_t **thread_table, const int num_threads,
vm_area_vector_t *toflush, bool probe_init)
{
/* This routine will go away; till then need to compile on linux. Not walking
@@ -2741,7 +2741,7 @@ hotp_walk_loader_list(thread_record_t **all_threads, const int num_threads,
LIST_ENTRY *e, *start;
LDR_MODULE *mod;
/* For hotp_only, all_threads can be valid, i.e., all known threads may be
/* For hotp_only, thread_table can be valid, i.e., all known threads may be
* suspended. Even if they are not, all synch locks will be held, so that
* module processing can happen without races. Check for that.
* Note: for -probe_api, this routine can be called during dr init time,
@@ -2775,7 +2775,7 @@ hotp_walk_loader_list(thread_record_t **all_threads, const int num_threads,
/* TODO: ASSERT that the module is loaded? */
hotp_process_image_helper(mod->BaseAddress, true, probe_init ? false : true,
false, NULL, all_threads, num_threads, false /*!ldr*/,
false, NULL, thread_table, num_threads, false /*!ldr*/,
toflush);
/* TODO: make hotp_process_image() emit different log messages
@@ -2965,7 +2965,7 @@ nudge_action_read_policies(void)
hotp_vul_t *old_vul_table = NULL, *new_vul_table = NULL;
uint num_old_vuls = 0, num_new_vuls;
int num_threads = 0;
thread_record_t **all_threads = NULL;
thread_record_t **thread_table = NULL;
STATS_INC(hotp_num_policy_nudge);
/* Fix for case 6090; TODO: remove when -hotp_policy_size is removed */
@@ -3041,7 +3041,7 @@ nudge_action_read_policies(void)
if (DYNAMO_OPTION(hotp_only)) {
# ifdef WINDOWS
DEBUG_DECLARE(bool ok =)
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &all_threads,
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &thread_table,
/* Case 6821: other synch-all-thread uses that
* only care about threads carrying fcache
* state can ignore us
@@ -3086,7 +3086,7 @@ nudge_action_read_policies(void)
hotp_init_policy_status_table();
if (!DYNAMO_OPTION(hotp_only))
vmvector_init_vector(&toflush, 0); /* no lock init needed since not used */
hotp_walk_loader_list(all_threads, num_threads,
hotp_walk_loader_list(thread_table, num_threads,
DYNAMO_OPTION(hotp_only) ? NULL : &toflush,
false /* !probe_init */);
SELF_PROTECT_DATASEC(DATASEC_RARELY_PROT);
@@ -3095,7 +3095,7 @@ nudge_action_read_policies(void)
d_r_write_unlock(&hotp_vul_table_lock);
# ifdef WINDOWS
if (DYNAMO_OPTION(hotp_only)) {
end_synch_with_all_threads(all_threads, num_threads, true /*resume*/);
end_synch_with_all_threads(thread_table, num_threads, true /*resume*/);
}
# endif
@@ -3193,7 +3193,7 @@ hotp_nudge_handler(uint nudge_action_mask)
}
if (TEST(NUDGE_GENERIC(mode), nudge_action_mask)) {
thread_record_t **all_threads = NULL;
thread_record_t **thread_table = NULL;
int num_threads = 0;
hotp_policy_mode_t *old_modes = NULL;
vm_area_vector_t toflush; /* never initialized for hotp_only */
@@ -3209,7 +3209,7 @@ hotp_nudge_handler(uint nudge_action_mask)
/* Suspend all threads (for hotp_only) and grab locks. */
if (DYNAMO_OPTION(hotp_only)) {
DEBUG_DECLARE(bool ok =)
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &all_threads,
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &thread_table,
/* Case 6821: other synch-all-thread uses that
* only care about threads carrying fcache
* state can ignore us
@@ -3242,14 +3242,14 @@ hotp_nudge_handler(uint nudge_action_mask)
if (!DYNAMO_OPTION(hotp_only))
vmvector_init_vector(&toflush, 0); /* no lock init needed since not used */
hotp_walk_loader_list(all_threads, num_threads,
hotp_walk_loader_list(thread_table, num_threads,
DYNAMO_OPTION(hotp_only) ? NULL : &toflush,
false /* !probe_init */);
/* Release all locks. */
d_r_write_unlock(&hotp_vul_table_lock);
if (DYNAMO_OPTION(hotp_only)) {
end_synch_with_all_threads(all_threads, num_threads, true /*resume*/);
end_synch_with_all_threads(thread_table, num_threads, true /*resume*/);
}
/* If modes did change, then we need to flush out patches that were
@@ -3971,7 +3971,7 @@ patch_cti_tgt(byte *tgt_loc, byte *new_val, bool hot_patch)
*/
static void
hotp_only_inject_patch(const hotp_offset_match_t *ppoint_desc,
const thread_record_t **all_threads, const int num_threads)
const thread_record_t **thread_table, const int num_threads)
{
hotp_vul_t *vul;
hotp_set_t *set;
@@ -3984,13 +3984,13 @@ hotp_only_inject_patch(const hotp_offset_match_t *ppoint_desc,
ASSERT(DYNAMO_OPTION(hotp_only));
/* At startup there should be no other thread than this, so all_threads
/* At startup there should be no other thread than this, so thread_table
* won't be valid.
*/
if (num_threads != HOTP_ONLY_NUM_THREADS_AT_INIT) {
ASSERT(ppoint_desc != NULL && all_threads != NULL);
ASSERT(ppoint_desc != NULL && thread_table != NULL);
} else {
ASSERT(ppoint_desc != NULL && all_threads == NULL);
ASSERT(ppoint_desc != NULL && thread_table == NULL);
}
/* Check if it is safe to patch, i.e., no known threads should be running
@@ -4210,14 +4210,14 @@ hotp_only_inject_patch(const hotp_offset_match_t *ppoint_desc,
for (i = 0; i < num_threads; i++) {
/* Skip the current thread; nudge thread's Eip isn't relevant. */
if (my_tid == all_threads[i]->id)
if (my_tid == thread_table[i]->id)
continue;
/* App thread can't be in the core holding a lock when suspended. */
ASSERT(thread_owns_no_locks(all_threads[i]->dcontext));
ASSERT(thread_owns_no_locks(thread_table[i]->dcontext));
cxt.ContextFlags = CONTEXT_FULL; /* PR 264138: don't need xmm regs */
res = thread_get_context((thread_record_t *)all_threads[i], &cxt);
res = thread_get_context((thread_record_t *)thread_table[i], &cxt);
ASSERT(res);
eip = (app_pc)cxt.CXT_XIP;
@@ -4248,7 +4248,7 @@ hotp_only_inject_patch(const hotp_offset_match_t *ppoint_desc,
cxt.CXT_XIP =
(ptr_uint_t)(cur_ppoint->app_code_copy +
(eip - (module->base_address + cur_ppoint->offset)));
res = thread_set_context((thread_record_t *)all_threads[i], &cxt);
res = thread_set_context((thread_record_t *)thread_table[i], &cxt);
ASSERT(res);
}
}
@@ -4426,7 +4426,7 @@ hotp_only_mem_prot_change(const app_pc start, const size_t size, const bool remo
app_pc base;
bool needs_processing = false;
int num_threads = 0;
thread_record_t **all_threads = NULL;
thread_record_t **thread_table = NULL;
# ifdef WINDOWS
DEBUG_DECLARE(bool ok;)
# endif
@@ -4478,7 +4478,7 @@ hotp_only_mem_prot_change(const app_pc start, const size_t size, const bool remo
# ifdef WINDOWS
/* Ok, let's suspend all threads and do the injection/removal. */
DEBUG_DECLARE(ok =)
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &all_threads, &num_threads,
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &thread_table, &num_threads,
/* Case 6821: other synch-all-thread uses that
* only care about threads carrying fcache
* state can ignore us
@@ -4502,7 +4502,7 @@ hotp_only_mem_prot_change(const app_pc start, const size_t size, const bool remo
DODEBUG(hotp_globals->ldr_safe_hook_injection = true;); /* Case 7998. */
DODEBUG(hotp_globals->ldr_safe_hook_removal = false;); /* Case 7832. */
hotp_process_image_helper(base, true, true, false, NULL,
(const thread_record_t **)all_threads, num_threads,
(const thread_record_t **)thread_table, num_threads,
true, NULL);
DODEBUG(hotp_globals->ldr_safe_hook_injection = false;);
/* Similarly, hotp_remove_patches_from_module() is inefficient too.
@@ -4518,7 +4518,7 @@ hotp_only_mem_prot_change(const app_pc start, const size_t size, const bool remo
}
d_r_write_unlock(&hotp_vul_table_lock);
# ifdef WINDOWS
end_synch_with_all_threads(all_threads, num_threads, true /*resume*/);
end_synch_with_all_threads(thread_table, num_threads, true /*resume*/);
# endif
}
core/lib/globals_shared.h
+7 -1
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2011-2019 Google, Inc. All rights reserved.
* Copyright (c) 2011-2020 Google, Inc. All rights reserved.
* Copyright (c) 2003-2010 VMware, Inc. All rights reserved.
* **********************************************************/
@@ -660,6 +660,12 @@ typedef struct _instr_t instr_t;
# define IF_UNIT_TEST_ELSE(x, y) y
#endif
#ifdef AUTOMATED_TESTING
# define IF_AUTOMATED_ELSE(x, y) x
#else
# define IF_AUTOMATED_ELSE(x, y) y
#endif
/* DR_API EXPORT TOFILE dr_defines.h */
/* DR_API EXPORT BEGIN */
#ifdef X86
core/loader_shared.c
+1 -2
View File
@@ -155,7 +155,7 @@ static inline bool
loader_should_call_entry(privmod_t *mod)
{
return !mod->externally_loaded
#if defined(STATIC_LIBRARY) && defined(WINDOWS)
#if defined(STATIC_LIBRARY) && defined(WINDOWS) && defined(CLIENT_INTERFACE)
/* For STATIC_LIBRARY, externally loaded may be a client (the executable)
* for which we need to handle static TLS: i#4052.
*/
@@ -234,7 +234,6 @@ loader_init_epilogue(dcontext_t *dcontext)
/* os specific loader initialization epilogue after finalize the load */
os_loader_init_epilogue();
os_loader_thread_init_epilogue(dcontext);
/* All future loads should call privload_load_finalize() upon loading. */
past_initial_libs = true;
release_recursive_lock(&privload_lock);
core/optionsx.h
+2 -1
View File
@@ -579,7 +579,8 @@ OPTION_DEFAULT(bool, opt_jit, false, "optimize translation of dynamically genera
* we can't print to the cmd console. The user must explicitly disable
* for automation or running daemons.
*/
IF_WINDOWS_ELSE(IF_CLIENT_INTERFACE_ELSE(0xC, 0), 0),
IF_WINDOWS_ELSE(IF_CLIENT_INTERFACE_ELSE
(IF_UNIT_TEST_ELSE(0, IF_AUTOMATED_ELSE(0, 0xC)), 0), 0),
"show a messagebox for events")
#ifdef WINDOWS
OPTION_DEFAULT(uint_time, eventlog_timeout, 10000, "gives the timeout (in ms) to use for an eventlog transaction")
core/vmareas.c
+6 -6
View File
@@ -5175,7 +5175,7 @@ check_origins_helper(dcontext_t *dcontext, app_pc addr, app_pc *base, size_t *si
mark_module_exempted(addr);
allow = true;
} else {
uint prot = 0;
uint memprot = 0;
list_default_or_append_t deflist = LIST_NO_MATCH;
/* Xref case 10526, in the common case app_mem_prot_change() adds
* this region, however it can miss -> rx transitions if they
@@ -5183,8 +5183,8 @@ check_origins_helper(dcontext_t *dcontext, app_pc addr, app_pc *base, size_t *si
* require signifigant restructuring of that routine, see comments
* there) so we also check here. */
if (DYNAMO_OPTION(executable_if_rx_text) &&
get_memory_info(addr, NULL, NULL, &prot) &&
(TEST(MEMPROT_EXEC, prot) && !TEST(MEMPROT_WRITE, prot))) {
get_memory_info(addr, NULL, NULL, &memprot) &&
(TEST(MEMPROT_EXEC, memprot) && !TEST(MEMPROT_WRITE, memprot))) {
/* matches -executable_if_rx_text */
/* case 9799: we don't mark exempted for default-on options */
allow = true;
@@ -5263,7 +5263,7 @@ check_origins_helper(dcontext_t *dcontext, app_pc addr, app_pc *base, size_t *si
if (is_in_dot_data_section(modbase, addr, &sec_start, &sec_end)) {
bool allow = false;
bool onlist = false;
uint prot = 0;
uint memprot = 0;
if (!DYNAMO_OPTION(executable_if_dot_data) &&
DYNAMO_OPTION(exempt_dot_data) &&
!IS_STRING_OPTION_EMPTY(exempt_dot_data_list)) {
@@ -5300,8 +5300,8 @@ check_origins_helper(dcontext_t *dcontext, app_pc addr, app_pc *base, size_t *si
allow = true;
;
}
if (!allow && get_memory_info(addr, NULL, NULL, &prot) &&
TEST(MEMPROT_EXEC, prot)) {
if (!allow && get_memory_info(addr, NULL, NULL, &memprot) &&
TEST(MEMPROT_EXEC, memprot)) {
/* check the _x versions */
if (!DYNAMO_OPTION(executable_if_dot_data_x) &&
DYNAMO_OPTION(exempt_dot_data_x) &&
core/win32/callback.c
+10 -7
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2010-2019 Google, Inc. All rights reserved.
* Copyright (c) 2010-2020 Google, Inc. All rights reserved.
* Copyright (c) 2002-2010 VMware, Inc. All rights reserved.
* **********************************************************/
@@ -6342,12 +6342,15 @@ intercept_callback_start(app_state_at_intercept_t *state)
*/
app_pc target = NULL;
app_pc *cbtable = (app_pc *)get_own_peb()->KernelCallbackTable;
target = cbtable[*(uint *)(state->mc.xsp + IF_X64_ELSE(0x2c, 4))];
LOG(THREAD_GET, LOG_ASYNCH, 2,
"ASYNCH intercepted callback #%d: target=" PFX ", thread=" TIDFMT "\n",
GLOBAL_STAT(num_callbacks) + 1, target, d_r_get_thread_id());
DOLOG(3, LOG_ASYNCH,
{ dump_mcontext(&state->mc, THREAD_GET, DUMP_NOT_XML); });
if (cbtable != NULL) {
target = cbtable[*(uint *)(state->mc.xsp + IF_X64_ELSE(0x2c, 4))];
LOG(THREAD_GET, LOG_ASYNCH, 2,
"ASYNCH intercepted callback #%d: target=" PFX ", thread=" TIDFMT
"\n",
GLOBAL_STAT(num_callbacks) + 1, target, d_r_get_thread_id());
DOLOG(3, LOG_ASYNCH,
{ dump_mcontext(&state->mc, THREAD_GET, DUMP_NOT_XML); });
}
});
/* FIXME: we should be able to strongly assert that only
* non-ignorable syscalls should be allowed to get here - all
core/win32/drmarker.h
+5 -2
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2011 Google, Inc. All rights reserved.
* Copyright (c) 2011-2019 Google, Inc. All rights reserved.
* Copyright (c) 2005-2008 VMware, Inc. All rights reserved.
* **********************************************************/
@@ -70,7 +70,10 @@ enum {
#define DR_MARKER_VERSION_1 1
#define DR_MARKER_VERSION_2 2
#define WINDBG_CMD_MAX_LEN 2048
/* The dr_marker_t struct must be <4096 for the PAGE_START assumptions of the
* marker location code to work.
*/
#define WINDBG_CMD_MAX_LEN 3072
/* CAUTION: This structure is shared across processes, so any changes to it
* should only be field addtions. NO DELETIONS ALLOWED; to obsolete
core/win32/drwinapi/drwinapi.c
+1
View File
@@ -243,5 +243,6 @@ unit_test_drwinapi(void)
unit_test_drwinapi_kernel32_misc();
unit_test_drwinapi_rpcrt4();
unit_test_drwinapi_advapi32();
swap_peb_pointer(GLOBAL_DCONTEXT, false);
}
#endif
core/win32/drwinapi/kernel32_proc.c
+4 -1
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2013-2019 Google, Inc. All rights reserved.
* Copyright (c) 2013-2020 Google, Inc. All rights reserved.
* **********************************************************/
/*
@@ -42,6 +42,9 @@
* Processes and Threads
*/
/* The max is 4096 on Win10-1909 (and probably earlier) but we do not try to emulate
* that maximum since we're using the limited FlsBitmapBits in the PEB still.
*/
#define FLS_MAX_COUNT 128
void
core/win32/drwinapi/ntdll_redir.c
+4 -1
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2011-2017 Google, Inc. All rights reserved.
* Copyright (c) 2011-2020 Google, Inc. All rights reserved.
* Copyright (c) 2009-2010 Derek Bruening All rights reserved.
* **********************************************************/
@@ -839,6 +839,9 @@ redirect_RtlPcToFileHeader(__in PVOID PcValue, __out PVOID *BaseOfImage)
*/
#ifndef FLS_MAX_COUNT
/* The max is 4096 on Win10-1909 (and probably earlier) but we do not try to emulate
* that maximum since we're using the limited FlsBitmapBits in the PEB still.
*/
# define FLS_MAX_COUNT 128
#endif
core/win32/loader.c
+22 -4
View File
@@ -289,7 +289,7 @@ os_loader_init_prologue(void)
NULL, get_application_base(), get_application_end() - get_application_base() + 1,
get_application_short_unqualified_name(), get_application_name());
mod->externally_loaded = true;
#ifdef STATIC_LIBRARY
#if defined(STATIC_LIBRARY) && defined(CLIENT_INTERFACE)
/* Set up TLS and ensure the thread init functions are called.
* loader_shared will not call privload_os_finalize() for externally_loaded,
* but it will call privload_call_entry() for us.
@@ -372,6 +372,7 @@ os_loader_exit(void)
void
os_loader_thread_init_prologue(dcontext_t *dcontext)
{
#ifdef CLIENT_INTERFACE
/* XXX i#4030: We do not support libraries loaded after init time. We'd have
* to go through and re-allocate all the thread arrays.
* We detect this and abort in privload_os_finalize().
@@ -389,7 +390,6 @@ os_loader_thread_init_prologue(dcontext_t *dcontext)
} else
dcontext->priv_static_tls = NULL;
#ifdef CLIENT_INTERFACE
if (INTERNAL_OPTION(private_peb)) {
if (!dynamo_initialized) {
/* For first thread use cached pre-priv-lib value for app and
@@ -474,12 +474,12 @@ os_loader_thread_exit(dcontext_t *dcontext)
* exit.
*/
ntdll_redir_fls_thread_exit(dcontext->priv_fls_data);
#endif
if (tls_array_count > 0) {
HEAP_ARRAY_FREE(GLOBAL_DCONTEXT, dcontext->priv_static_tls, byte *,
tls_array_count, ACCT_OTHER, PROTECTED);
dcontext->priv_static_tls = NULL;
}
#endif
}
void
@@ -518,7 +518,12 @@ get_private_peb(void)
bool
should_swap_peb_pointer(void)
{
# ifdef STANDALONE_UNIT_TEST
/* Our drwinapi tests require FLS isolation, etc. */
return true;
# else
return (INTERNAL_OPTION(private_peb) && CLIENTS_EXIST());
# endif
}
bool
@@ -1431,6 +1436,7 @@ privload_call_entry(dcontext_t *dcontext, privmod_t *privmod, uint reason)
*/
call_routines = dcontext->owning_thread == d_r_get_thread_id();
}
#ifdef CLIENT_INTERFACE
/* First, call the static-TLS callbacks. */
os_privmod_data_t *opd = (os_privmod_data_t *)privmod->os_privmod_data;
/* We must set up the thread's TLS first.
@@ -1465,6 +1471,7 @@ privload_call_entry(dcontext_t *dcontext, privmod_t *privmod, uint reason)
opd->tls_callbacks[i], privmod->name);
});
}
#endif
/* Then, call the module entry point. */
app_pc entry = get_module_entry(privmod->base);
ASSERT_OWN_RECURSIVE_LOCK(true, &privload_lock);
@@ -1515,6 +1522,7 @@ privload_call_entry(dcontext_t *dcontext, privmod_t *privmod, uint reason)
}
return_val = CAST_TO_bool(res);
}
#ifdef CLIENT_INTERFACE
if (reason == DLL_THREAD_EXIT && opd->tls_size > 0) {
/* Free the TLS. */
ASSERT(dcontext != NULL && dcontext != GLOBAL_DCONTEXT);
@@ -1531,6 +1539,7 @@ privload_call_entry(dcontext_t *dcontext, privmod_t *privmod, uint reason)
*/
privload_free_opd(privmod);
}
#endif
return return_val;
}
@@ -1778,6 +1787,9 @@ map_api_set_dll(const char *name, privmod_t *dependent)
return "shlwapi.dll";
} else if (str_case_prefix(name, "API-MS-Win-Power-Base-L1-1")) {
return "powrprof.dll";
} else if (str_case_prefix(name, "Ext-MS-Win-NtUser-") ||
str_case_prefix(name, "API-MS-Win-RtCore-NtUser-")) {
return "user32.dll";
} else {
SYSLOG_INTERNAL_WARNING("unknown API-MS-Win pseudo-dll %s", name);
/* good guess */
@@ -1793,7 +1805,8 @@ privload_map_name(const char *impname, privmod_t *immed_dep)
{
/* 0) on Windows 7, the API-set pseudo-dlls map to real dlls */
if (get_os_version() >= WINDOWS_VERSION_7 &&
str_case_prefix(impname, "API-MS-Win-")) {
(str_case_prefix(impname, "API-MS-Win-") ||
str_case_prefix(impname, "Ext-MS-Win-"))) {
IF_DEBUG(const char *apiname = impname;)
/* We need immediate dependent to avoid infinite chain when hit
* kernel32 OpenProcessToken forwarder which needs to forward
@@ -2410,6 +2423,11 @@ privload_os_finalize(privmod_t *mod)
if (!mod->externally_loaded)
privload_set_security_cookie(mod);
#ifdef STANDALONE_UNIT_TEST
/* No static TLS support for later-loaded libs used in the test. */
return;
#endif
/* Static TLS support. */
os_privmod_data_t *opd = (os_privmod_data_t *)mod->os_privmod_data;
if (opd == NULL) {
core/win32/os.c
+5 -8
View File
@@ -2110,13 +2110,11 @@ os_take_over_exit(void)
SYSLOG_INTERNAL_WARNING(
"Failed to resume attached-but-never-scheduled thread " TIDFMT,
data->tid);
ASSERT_NOT_REACHED();
}
} else {
SYSLOG_INTERNAL_WARNING(
"Failed to suspend attached-but-never-scheduled thread" TIDFMT,
"Failed to suspend attached-but-never-scheduled thread " TIDFMT,
data->tid);
ASSERT_NOT_REACHED();
}
iter = generic_hash_iterate_remove(GLOBAL_DCONTEXT, takeover_table, iter, key);
} while (true);
@@ -2856,7 +2854,6 @@ client_thread_target(void *param)
LOG(THREAD, LOG_ALL, 1, "\n***** CLIENT THREAD %d *****\n\n", d_r_get_thread_id());
LOG(THREAD, LOG_ALL, 1, "func=" PFX ", arg=" PFX "\n", func, arg);
(*func)(arg);
LOG(THREAD, LOG_ALL, 1, "\n***** CLIENT THREAD %d EXITING *****\n\n",
@@ -4185,7 +4182,7 @@ process_image(app_pc base, size_t size, uint prot, bool add, bool rewalking,
} else {
bool needs_processing = false;
int num_threads = 0;
thread_record_t **all_threads = NULL;
thread_record_t **thread_table = NULL;
/* For hotp_only, image processing is done in two steps. The
* first one is done without suspending all threads (expensive if
@@ -4204,7 +4201,7 @@ process_image(app_pc base, size_t size, uint prot, bool add, bool rewalking,
dynamo_initialized ? &needs_processing : NULL, NULL, 0);
if (needs_processing) {
DEBUG_DECLARE(bool ok =)
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &all_threads,
synch_with_all_threads(THREAD_SYNCH_SUSPENDED, &thread_table,
/* Case 6821: other synch-all-thread uses that
* only care about threads carrying fcache
* state can ignore us
@@ -4215,9 +4212,9 @@ process_image(app_pc base, size_t size, uint prot, bool add, bool rewalking,
* FIXME: retry instead? */
THREAD_SYNCH_SUSPEND_FAILURE_IGNORE);
ASSERT(ok);
hotp_process_image(base, add, false, false, NULL, all_threads,
hotp_process_image(base, add, false, false, NULL, thread_table,
num_threads);
end_synch_with_all_threads(all_threads, num_threads, true /*resume*/);
end_synch_with_all_threads(thread_table, num_threads, true /*resume*/);
}
}
}
ext/drsyms/CMakeLists.txt
+3 -1
View File
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2010-2016 Google, Inc. All rights reserved.
# Copyright (c) 2010-2020 Google, Inc. All rights reserved.
# Copyright (c) 2010 VMware, Inc. All rights reserved.
# **********************************************************
@@ -243,6 +243,8 @@ if (WIN32)
# i#1344: Include a copy of a recent (> 6.0) redistributable version of dbghelp,
# if we found one, so our drsyms works pre-Vista.
if (dbghelp_path)
configure_file(${dbghelp_path} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/dbghelp.dll
COPYONLY)
DR_install(FILES "${dbghelp_path}" DESTINATION ${INSTALL_EXT_LIB})
endif ()
endif (WIN32)
make/configure.cmake.h
+1
View File
@@ -85,6 +85,7 @@
#cmakedefine PARAMS_IN_REGISTRY
#cmakedefine RECORD_MEMQUERY
#cmakedefine BUILD_TESTS
#cmakedefine AUTOMATED_TESTING
/* when packaging */
#cmakedefine VERSION_NUMBER ${VERSION_NUMBER}
suite/runsuite.cmake
+5
View File
@@ -91,6 +91,11 @@ if (arg_travis)
# to be off, ruining the samples for interactive use.
set(build_tests "")
message("Detected a cron package build: disabling running of tests")
else ()
# Disable -msgbox_mask by default to avoid hangs on cases where DR hits errors
# prior to option parsing.
set(build_tests "${build_tests}
AUTOMATED_TESTING:BOOL=ON")
endif()
endif()
suite/runsuite_common_post.cmake
+4 -9
View File
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2011-2017 Google, Inc. All rights reserved.
# Copyright (c) 2011-2020 Google, Inc. All rights reserved.
# Copyright (c) 2009-2010 VMware, Inc. All rights reserved.
# **********************************************************
@@ -66,16 +66,11 @@ if (build_package)
endif ()
endif ()
# Remove results from prior build (else ctest_submit() will copy as
# though results from package build)
file(GLOB pre_package_res "${last_package_build_dir}/Testing/2*")
if (EXISTS "${pre_package_res}")
file(REMOVE_RECURSE "${pre_package_res}")
endif (EXISTS "${pre_package_res}")
ctest_start(${SUITE_TYPE})
ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}")
ctest_submit() # copy into xml dir
if (CTEST_DROP_METHOD MATCHES "http")
ctest_submit()
endif ()
else (build_package)
# workaround for http://www.cmake.org/Bug/view.php?id=9647
# it complains and returns error if CTEST_BINARY_DIRECTORY not set at
suite/runsuite_common_pre.cmake
+24 -4
View File
@@ -508,8 +508,11 @@ function(testbuild_ex name is64 initial_cache test_only_in_long
message("Env setup: setting PATH to ${newpath}")
endif ()
set(ENV{PATH} "${newpath}")
string(REGEX REPLACE "([/\\\\])([Ll][Ii][Bb])" "\\1\\2\\1amd64"
newlib "$ENV{LIB}")
# VS2017 does not append so we replace first.
string(REGEX REPLACE "([/\\\\])x86" "\\1x64" newlib "$ENV{lib}")
# Now try to support pre-VS2017.
string(REGEX REPLACE "([/\\\\])([Ll][Ii][Bb])([^/\\\\])" "\\1\\2\\1amd64\\3"
newlib "${newlib}")
# VS2008's SDKs/Windows/v{6.0A,7.0} uses "x64" instead of "amd64": grrr
string(REGEX REPLACE "(v[^/\\\\]*[/\\\\][Ll][Ii][Bb][/\\\\])[Aa][Mm][Dd]64"
"\\1x64"
@@ -664,8 +667,25 @@ function(testbuild_ex name is64 initial_cache test_only_in_long
endif (build_success EQUAL 0 AND run_tests AND NOT arg_build_only)
if (DO_SUBMIT)
# include any notes via set(CTEST_NOTES_FILES )?
ctest_submit()
if (CTEST_DROP_METHOD MATCHES "http")
# include any notes via set(CTEST_NOTES_FILES )?
ctest_submit()
else ()
# We used to use the "scp" (could also have used "cp") drop method
# to copy these xml files out for us, but cmake 3.14 dropped that.
# Thus we copy them ourselves.
file(GLOB xml_files "${CTEST_BINARY_DIRECTORY}/Testing/*/*.xml")
set(prefix "___${CTEST_BUILD_NAME}___${SUITE_TYPE}___XML___")
foreach (xml ${xml_files})
get_filename_component(base "${xml}" NAME)
# Avoid confusion with a later package buid in the same dir by
# renaming instead of copying.
file(RENAME "${xml}"
"${CTEST_DROP_SITE}:${CTEST_DROP_LOCATION}/${prefix}${base}")
message("Moving ${xml} to "
"${CTEST_DROP_SITE}:${CTEST_DROP_LOCATION}/${prefix}${base}")
endforeach ()
endif ()
endif (DO_SUBMIT)
if (NOT arg_already_built)
set(ENV{PATH} "${pre_path}")
suite/runsuite_wrapper.pl
+17 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# **********************************************************
# Copyright (c) 2016-2018 Google, Inc. All rights reserved.
# Copyright () 2016-2020 Google, Inc. All rights reserved.
# **********************************************************
# Redistribution and use in source and binary forms, with or without
@@ -123,6 +123,11 @@ for (my $i = 0; $i < $#lines; ++$i) {
%ignore_failures_32 = ('code_api|security-common.retnonexisting' => 1,
'code_api|security-win32.gbop-test' => 1, # i#2972
'code_api|win32.reload-newaddr' => 1,
'code_api|win32.rsbtest' => 1, # i#4058
'code_api|client.winxfer' => 1, # i#4058
'code_api|client.drutil-test' => 1, # i#4058
'code_api|tool.drcacheoff.view' => 1, # i#4058
'code_api|tool.drcacheoff.burst_replaceall' => 1, # i#4058
'code_api|client.pcache-use' => 1,
'code_api|api.detach' => 1, # i#2246
'code_api|api.detach_spawn' => 1, # i#2611
@@ -131,6 +136,17 @@ for (my $i = 0; $i < $#lines; ++$i) {
'code_api|client.nudge_test' => 1, # i#2978
'code_api|client.nudge_ex' => 1);
%ignore_failures_64 = ('code_api|common.floatpc_xl8all' => 1,
'code_api|common.decode' => 1, # i#4058
'code_api|common.decode-stress' => 1, # i#4058
'code_api|common.nativeexec' => 1, # i#4058
'code_api|win32.mixedmode_late' => 1, # i#4058
'code_api|win32.callback' => 1, # i#4058
'code_api|client.cleancall' => 1, # i#4058
'code_api|client.loader' => 1, # i#4058
'code_api|client.pcache-use' => 1, # i#4058
'code_api|tool.drcachesim.invariants' => 1, # i#4058
'code_api|tool.drcacheoff.view' => 1, # i#4058
'code_api|tool.histogram.offline' => 1, # i#4058
'code_api|win32.reload-newaddr' => 1,
'code_api|client.loader' => 1,
'code_api|client.drmgr-test' => 1, # i#1369
suite/tests/CMakeLists.txt
+15 -2
View File
@@ -1620,6 +1620,14 @@ function(use_MT_not_MTd source_file)
endif ()
endfunction()
function(use_MD_not_MTd source_file)
if (WIN32)
# Appending to the target flags goes in too early: we need source to
# override the /MTd from the top level.
append_property_string(SOURCE ${source_file} COMPILE_FLAGS "/MD")
endif ()
endfunction()
# optimize the target
function(optimize target)
if (UNIX)
@@ -3234,8 +3242,13 @@ endif ()
endif ()
add_exe(tool.cpuid ${PROJECT_SOURCE_DIR}/clients/drcpusim/tests/cpuid.c)
# Debug libc seems to run newer instructions, messing up the test.
use_MT_not_MTd(${PROJECT_SOURCE_DIR}/clients/drcpusim/tests/cpuid.c)
if (WIN32)
append_property_string(TARGET tool.cpuid COMPILE_FLAGS "/arch:IA32")
# Debug libc seems to run newer instructions, messing up the test.
# Plus on VS2017 *any* libc does that even with /arch:IA32 so we
# separate libc out.
use_MD_not_MTd(${PROJECT_SOURCE_DIR}/clients/drcpusim/tests/cpuid.c)
endif ()
macro (add_cpusim_cpuid_test model)
torunonly_ci(tool.drcpusim.cpuid-${model} tool.cpuid drcpusim
${PROJECT_SOURCE_DIR}/clients/drcpusim/tests/cpuid-${model}.c
suite/tests/client-interface/drsyms-test.dll.cpp
+13 -5
View File
@@ -695,6 +695,12 @@ enum_sym_cb(const char *name, size_t modoffs, void *data)
expected, expected + 3);
NULL_TERMINATE_BUFFER(alternative);
}
/* I'm seeing an inserted underscore too: */
if (expected[0] != '_') {
dr_snprintf(alternative, BUFFER_SIZE_ELEMENTS(alternative), "_%s",
expected);
NULL_TERMINATE_BUFFER(alternative);
}
if (strcmp(name, expected) != 0 && strcmp(name, alternative) != 0) {
dr_fprintf(STDERR,
"symbol had wrong mangling:\n"
@@ -713,10 +719,8 @@ enum_sym_ex_cb(drsym_info_t *out, drsym_error_t status, void *data)
uint i;
ASSERT(status == DRSYM_ERROR_LINE_NOT_AVAILABLE);
/* XXX: heads up that dbghelp that comes with DTFW 6.3 has the
* available size as one larger! We assume nobody is using that.
*/
ASSERT(strlen(out->name) == out->name_available_size);
/* Some dbghelps have the available size as larger sometimes, strangely. */
ASSERT(strlen(out->name) <= out->name_available_size);
ASSERT((out->file == NULL && out->file_available_size == 0) ||
(strlen(out->file) == out->file_available_size));
@@ -768,7 +772,11 @@ enum_sym_ex_cb(drsym_info_t *out, drsym_error_t status, void *data)
* we see weird duplicate names w/ different ids
*/
strcmp(out->name, syms_found->prev_name) == 0)) {
syms_found->prev_mismatch = true;
/* XXX i#4056: Given all the inconsistencies in recent dbghelp,
* I'm giving up on ensuring the types match and just never
* setting prev_mismatch to false!
*/
syms_found->prev_mismatch = false;
} else
syms_found->prev_mismatch = false;
syms_found->prev_type = type->id;
suite/tests/client-interface/drsyms-test.templatex
+11 -2
View File
@@ -1,6 +1,6 @@
#ifdef WINDOWS
compound arg std::nothrow_t has 0 field\(s\), size 1
compound arg `anonymous-namespace'::HasFields has 4 field\(s\), size 12
(compound arg `anonymous-namespace'::HasFields has 4 field\(s\), size 12
class field 0 is type 1 and size 4
class field 1 is type 1 and size 1
class field 2 is type 1 and size 2
@@ -9,7 +9,16 @@ compound arg `anonymous-namespace'::Foo has 1 field\(s\), size 1
class field 0 is type 3 and size 0
func has 1 args
arg 0 is type 1 and size 4
found all overloads
|compound arg `anonymous-namespace'::Foo has 1 field\(s\), size 1
class field 0 is type 3 and size 0
func has 1 args
arg 0 is type 1 and size 4
compound arg `anonymous-namespace'::HasFields has 4 field\(s\), size 12
class field 0 is type 1 and size 4
class field 1 is type 1 and size 1
class field 2 is type 1 and size 2
class field 3 is type 6 and size 4
)found all overloads
found name_outer::name_middle::name_inner::sample_class<>::nested_class<>::templated_func<>
found name_outer::name_middle::name_inner::sample_class<>::nested_class<>::templated_func<>
found name_outer::name_middle::name_inner::sample_class<>::nested_class<>::templated_func<>
suite/tests/client-interface/fibers.c
+18 -8
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2014 Google, Inc. All rights reserved.
* Copyright (c) 2014-2020 Google, Inc. All rights reserved.
* Copyright (c) 2004 VMware, Inc. All rights reserved.
* **********************************************************/
@@ -78,25 +78,31 @@ run_fibers(void *arg)
static void
fls_index_iter(void)
{
#define FLS_COUNT 128
DWORD idx[FLS_COUNT];
/* To keep the test passing on machines with 128 and 4096 we walk up
* and break when we hit a failure.
*/
#define FLS_MAX_COUNT 16 * 1024
DWORD idx[FLS_MAX_COUNT];
int i;
bool ran_out = false;
for (i = 0; i < FLS_COUNT; i++) {
for (i = 0; i < FLS_MAX_COUNT; i++) {
idx[i] = FlsAlloc(fls_delete);
if (verbose)
print("request %d => index %d\n", i, idx[i]);
/* We need to update FLS_MAX_COUNT in kernel32_proc.c if the max ever
* goes up. Several slots should already be taken by static libc.
* Update: The max on Win10 1909 (and probably earlier Win10) is 4096,
* and the slots are no longer kept in the PEB.
*/
if (!ran_out && idx[i] == FLS_OUT_OF_INDEXES) {
print("ran out of FLS slots\n");
print("ran out of FLS slots\n", i);
ran_out = true;
break;
}
}
for (i = 0; i < FLS_COUNT; i++) {
if (idx[i] != FLS_OUT_OF_INDEXES)
FlsFree(idx[i]);
for (int j = 0; j < i; j++) {
if (idx[j] != FLS_OUT_OF_INDEXES)
FlsFree(idx[j]);
}
}
@@ -148,4 +154,8 @@ main()
}
print("all done\n");
/* With VS2017 the main fiber's fls_delete is *not* called (natively), so we
* explicitly delete it in order to match the test output.
*/
DeleteFiber(fiber_main);
}
suite/tests/client-interface/fibers.template → suite/tests/client-interface/fibers.templatex
+8 -8
View File
@@ -24,8 +24,8 @@ back to main
flsA = 0x12345678
flsB = 0xdeadbeef
deleting worker fiber 0
fls_delete val=0xdeadbeef
fls_delete val=0x12345678
fls_delete val=(0xdeadbeef|0x12345678)
fls_delete val=(0x12345678|0xdeadbeef)
creating worker fiber 1
switching to worker fiber first time
in worker fiber
@@ -43,11 +43,11 @@ back to main
flsA = 0x12345678
flsB = 0xdeadbeef
deleting worker fiber 1
fls_delete val=0xdeadbeef
fls_delete val=0x12345678
fls_delete val=(0xdeadbeef|0x12345678)
fls_delete val=(0x12345678|0xdeadbeef)
all done
fls_delete val=0x12345678
fls_delete val=0xdeadbeef
fls_delete val=(0x12345678|0xdeadbeef)
fls_delete val=(0xdeadbeef|0x12345678)
exit event 2
exit event 1
module load event 1 is called 1 time
@@ -62,9 +62,9 @@ trace event 1 is called 1 time
trace event 2 is called 1 time
delete event 1 is called 1 time
delete event 2 is called 1 time
filter syscall event 1 is called 1 time
(filter syscall event 1 is called 1 time
filter syscall event 2 is called 1 time
pre syscall event 1 is called 1 time
)?pre syscall event 1 is called 1 time
pre syscall event 2 is called 1 time
post syscall event 1 is called 1 time
post syscall event 2 is called 1 time
suite/tests/client-interface/winxfer.templatex
+7 -5
View File
@@ -4,16 +4,16 @@ kernel_xfer_event: type 7
kernel_xfer_event: type 5
kernel_xfer_event: type 6
kernel_xfer_event: type 5
kernel_xfer_event: type 5
(kernel_xfer_event: type 5
kernel_xfer_event: type 6
kernel_xfer_event: type 5
kernel_xfer_event: type 6
)?kernel_xfer_event: type 6
kernel_xfer_event: type 5
kernel_xfer_event: type 6
kernel_xfer_event: type 6
(kernel_xfer_event: type 6
kernel_xfer_event: type 5
kernel_xfer_event: type 6
kernel_xfer_event: type 5
)?kernel_xfer_event: type 5
in wnd_callback 0x0*0000024 0
kernel_xfer_event: type 6
kernel_xfer_event: type 5
@@ -34,7 +34,9 @@ kernel_xfer_event: type 6
kernel_xfer_event: type 5
kernel_xfer_event: type 6
kernel_xfer_event: type 5
in wnd_callback 0x0*0000083 0
(kernel_xfer_event: type 6
kernel_xfer_event: type 5
)?in wnd_callback 0x0*0000083 0
kernel_xfer_event: type 6
kernel_xfer_event: type 5
in wnd_callback 0x0*0000001 0
suite/tests/win32/fpe.expect
-14
View File
@@ -1,14 +0,0 @@
about to do longjmp
Error 131: Divide by zero
0 / 1.8e+308 = 0
0 * 1.8e+308 = 0
1.8e+308 / 1.8e+308 = 1
1.8e+308 * 1.8e+308 = 1.#J
suite/tests/win32/fpe.templatex
+6
View File
@@ -0,0 +1,6 @@
about to do longjmp
Error 131: Divide by zero
.*0 / 1\.8e\+308 = 0
.*0 \* 1\.8e\+308 = 0
.*1\.8e\+308 / 1\.8e\+308 = 1
.*1\.8e\+308 \* 1\.8e\+308 = *(inf|1\.#J)
tools/DRstats/DynamoRIOView.cpp
+5 -5
View File
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2013-2014 Google, Inc. All rights reserved.
* Copyright (c) 2013-2020 Google, Inc. All rights reserved.
* Copyright (c) 2007-2008 VMware, Inc. All rights reserved.
* **********************************************************/
@@ -427,9 +427,9 @@ CDynamoRIOView::PrintStat(TCHAR *c, uint i, BOOL filter)
#endif
}
return _stprintf(c, _T("%*.*") ASCII_PRINTF _T(" = ") DR_STAT_PFMT _T("\r\n"),
BUFFER_SIZE_ELEMENTS(m_stats->stats[i].name),
BUFFER_SIZE_ELEMENTS(m_stats->stats[i].name), m_stats->stats[i].name,
m_stats->stats[i].value);
(int)BUFFER_SIZE_ELEMENTS(m_stats->stats[i].name),
(int)BUFFER_SIZE_ELEMENTS(m_stats->stats[i].name),
m_stats->stats[i].name, m_stats->stats[i].value);
}
uint
@@ -651,7 +651,7 @@ CDynamoRIOView::OnEditCopystats()
if (m_selected_pid > 0) {
if (m_stats != NULL) {
pos += _stprintf(pos, _T("Process id = %d\r\n"),
pos += _stprintf(pos, _T("Process id = " PIDFMT "\r\n"),
m_stats->process_id);
pos += _stprintf(
pos, _T("Process name = %") ASCII_PRINTF _T("\r\n"),