Merge pull request #1907 from StalkR/ubsan

qemu: fix UBSAN errors in tcg and arm translation
This commit is contained in:
lazymio 2023-11-14 21:16:34 +08:00 committed by GitHub
commit c0adcfb5e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -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;

View File

@ -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 */