Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#3320: Fix type_is_instr assert in drcachesim #3859

Merged
merged 2 commits into from
Sep 27, 2019
Merged

i#3320: Fix type_is_instr assert in drcachesim #3859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b2c9fc
i#3320: Fix type_is_instr assert in drcachesim
derekbruening Sep 27, 2019
3e7c9b0
Merge branch 'master' of github.com:DynamoRIO/dynamorio into i3320-ty…
derekbruening Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions clients/drcachesim/reader/reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2016-2018 Google, Inc. All rights reserved.
* Copyright (c) 2016-2019 Google, Inc. All rights reserved.
* **********************************************************/

/*
Expand Down Expand Up @@ -129,7 +129,8 @@ reader_t::operator++()
have_memref = true;
// The trace stream always has the instr fetch first, which we
// use to compute the starting PC for the subsequent instructions.
assert(type_is_instr(cur_ref.instr.type));
assert(type_is_instr(cur_ref.instr.type) ||
cur_ref.instr.type == TRACE_TYPE_INSTR_NO_FETCH);
cur_ref.instr.size = input_entry->length[bundle_idx++];
cur_pc = next_pc;
cur_ref.instr.addr = cur_pc;
Expand Down