Skip to content

Fix memory update #11

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

Open
Byaidu wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix memory update #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c0bec
Merge branch 'develop'
gaasedelen Sep 14, 2021
c5dbc33
Fix memory update
Byaidu Oct 27, 2021
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
19 changes: 7 additions & 12 deletions plugins/tenet/trace/file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,23 +1206,18 @@ def get_mem_data(self, mem_id, set_id, data_mask):
else:
addrs, masks, offsets, data = self.read_addrs, self.read_masks, self.read_offsets, self.read_data

offset = offsets[mem_id] #sum([number_of_bits_set(mask) for mask in masks[:mem_id]])
#offset = sum([number_of_bits_set(mask) for mask in masks[:mem_id]])
length = number_of_bits_set(masks[mem_id])
raw_data = data[offset:offset+length]
src_mask = masks[mem_id]
src_offset = offsets[mem_id]

address = self.trace.mem_addrs[addrs[mem_id]]
output = TraceMemory(address, 8)

byte, i = 0, 0

while data_mask:
if data_mask & 1:
output.data[i] = raw_data[byte]
for i in range(8):
if (data_mask >> i) & 1:
output.data[i] = data[src_offset]
output.mask[i] = 0xFF
byte += 1
i += 1
data_mask >>= 1
if (src_mask >> i) & 1:
src_offset += 1

#assert byte == length

Expand Down