Skip to content
New issue

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

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

Already on GitHub? # to your account

qemu: fix ASAN errors in tcg and arm translation #1904

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 qemu/include/tcg/tcg-op.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ static inline void gen_uc_tracecode(TCGContext *tcg_ctx, int32_t size, int32_t t
0
};

if (puc->hooks_count[type] == 1) {
cur = puc->hook[type].head;
const int hook_type = type & UC_HOOK_IDX_MASK;
if (puc->hooks_count[hook_type] == 1) {
cur = puc->hook[hook_type].head;

while (cur) {
hk = cur->data;
Expand Down
2 changes: 1 addition & 1 deletion qemu/target/arm/translate.c
Original file line number Diff line number Diff line change
Expand Up @@ -7761,7 +7761,7 @@ static int t32_expandimm_rot(DisasContext *s, int x)
/* Return the unrotated immediate from T32ExpandImm. */
static int t32_expandimm_imm(DisasContext *s, int x)
{
int imm = extract32(x, 0, 8);
uint32_t imm = extract32(x, 0, 8);

switch (extract32(x, 8, 4)) {
case 0: /* XY */
Expand Down
Loading