yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-24 14:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: Use uintptr_t type for jmp_list_{next|first} fields of TB

Browse source 
These fields do not contain pure pointers to a TranslationBlock
structure. So uintptr_t is the most appropriate type for them.
Also put some asserts to assure that the two least significant bits of
the pointer are always zero before assigning it to jmp_list_first.

Backports commit c37e6d7e3589ecb96914faa21025ad7ba6654aea from qemu
This commit is contained in:
Sergey Fedorov 2018-02-23 21:16:45 -05:00 committed by Lioncash
parent e60c24cecf
commit fbc0a1105f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qemu/include/exec/exec-all.h
View file

@ -274,14 +274,16 @@ struct TranslationBlock {
* jmp_list_first points to the first TB jumping to this one. * jmp_list_first points to the first TB jumping to this one.
* jmp_list_next is used to point to the next TB in a list. * jmp_list_next is used to point to the next TB in a list.
* Since each TB can have two jumps, it can participate in two lists. * Since each TB can have two jumps, it can participate in two lists.
* The two least significant bits of a pointer are used to choose which * jmp_list_first and jmp_list_next are 4-byte aligned pointers to a
* data field holds a pointer to the next TB: * TranslationBlock structure, but the two least significant bits of
* them are used to encode which data field of the pointed TB should
* be used to traverse the list further from that TB:
* 0 => jmp_list_next[0], 1 => jmp_list_next[1], 2 => jmp_list_first. * 0 => jmp_list_next[0], 1 => jmp_list_next[1], 2 => jmp_list_first.
* In other words, 0/1 tells which jump is used in the pointed TB, * In other words, 0/1 tells which jump is used in the pointed TB,
* and 2 means that this is a pointer back to the target TB of this list. * and 2 means that this is a pointer back to the target TB of this list.
*/ */
struct TranslationBlock *jmp_list_next[2]; uintptr_t jmp_list_next[2];
struct TranslationBlock *jmp_list_first; uintptr_t jmp_list_first;
}; };
typedef struct TBContext TBContext; typedef struct TBContext TBContext;
@ -376,7 +378,7 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
/* add in TB jmp circular list */ /* add in TB jmp circular list */
tb->jmp_list_next[n] = tb_next->jmp_list_first; tb->jmp_list_next[n] = tb_next->jmp_list_first;
tb_next->jmp_list_first = (TranslationBlock *)((uintptr_t)tb | n); tb_next->jmp_list_first = (uintptr_t)tb | n;
} }
} }

37
qemu/translate-all.c
View file

@ -1008,17 +1008,17 @@ static inline void tb_page_remove(TranslationBlock **ptb, TranslationBlock *tb)
static inline void tb_jmp_remove(TranslationBlock *tb, int n) static inline void tb_jmp_remove(TranslationBlock *tb, int n)
{ {
TranslationBlock *tb1, **ptb; TranslationBlock *tb1;
uintptr_t *ptb, ntb;
unsigned int n1; unsigned int n1;
ptb = &tb->jmp_list_next[n]; ptb = &tb->jmp_list_next[n];
tb1 = *ptb; if (*ptb) {
if (tb1) {
/* find tb(n) in circular list */ /* find tb(n) in circular list */
for (;;) { for (;;) {
tb1 = *ptb; ntb = *ptb;
n1 = (uintptr_t)tb1 & 3; n1 = ntb & 3;
tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); tb1 = (TranslationBlock *)(ntb & ~3);
if (n1 == n && tb1 == tb) { if (n1 == n && tb1 == tb) {
break; break;
} }
@ -1031,7 +1031,7 @@ static inline void tb_jmp_remove(TranslationBlock *tb, int n)
/* now we can suppress tb(n) from the list */ /* now we can suppress tb(n) from the list */
*ptb = tb->jmp_list_next[n]; *ptb = tb->jmp_list_next[n];
tb->jmp_list_next[n] = NULL; tb->jmp_list_next[n] = (uintptr_t)NULL;
} }
} }
@ -1052,7 +1052,7 @@ void tb_phys_invalidate(struct uc_struct *uc,
PageDesc *p; PageDesc *p;
unsigned int h, n1; unsigned int h, n1;
tb_page_addr_t phys_pc; tb_page_addr_t phys_pc;
TranslationBlock *tb1, *tb2; uintptr_t tb1, tb2;
/* remove the TB from the hash list */ /* remove the TB from the hash list */
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
@ -1086,19 +1086,21 @@ void tb_phys_invalidate(struct uc_struct *uc,
/* suppress any remaining jumps to this TB */ /* suppress any remaining jumps to this TB */
tb1 = tb->jmp_list_first; tb1 = tb->jmp_list_first;
for (;;) { for (;;) {
n1 = (uintptr_t)tb1 & 3; TranslationBlock *tmp_tb;
n1 = tb1 & 3;
if (n1 == 2) { if (n1 == 2) {
break; break;
} }
tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); tmp_tb = (TranslationBlock *)(tb1 & ~3);
tb2 = tb1->jmp_list_next[n1]; tb2 = tmp_tb->jmp_list_next[n1];
tb_reset_jump(tb1, n1); tb_reset_jump(tmp_tb, n1);
tb1->jmp_list_next[n1] = NULL; tmp_tb->jmp_list_next[n1] = (uintptr_t)NULL;
tb1 = tb2; tb1 = tb2;
} }
/* fail safe */ /* fail safe */
tb->jmp_list_first = (TranslationBlock *)((uintptr_t)tb | 2); assert(((uintptr_t)tb & 3) == 0);
tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */
tcg_ctx->tb_ctx.tb_phys_invalidate_count++; tcg_ctx->tb_ctx.tb_phys_invalidate_count++;
} }
@ -1602,9 +1604,10 @@ static void tb_link_page(struct uc_struct *uc,
tb->page_addr[1] = -1; tb->page_addr[1] = -1;
} }
tb->jmp_list_first = (TranslationBlock *)((uintptr_t)tb | 2); assert(((uintptr_t)tb & 3) == 0);
tb->jmp_list_next[0] = NULL; tb->jmp_list_first = (uintptr_t)tb | 2;
tb->jmp_list_next[1] = NULL; tb->jmp_list_next[0] = (uintptr_t)NULL;
tb->jmp_list_next[1] = (uintptr_t)NULL;
/* init original jump addresses */ /* init original jump addresses */
if (tb->jmp_reset_offset[0] != TB_JMP_RESET_OFFSET_INVALID) { if (tb->jmp_reset_offset[0] != TB_JMP_RESET_OFFSET_INVALID) {