yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 18:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

cputlb: Replace SHIFT with DATA_SIZE

Browse source 
Backports commit dea2198201b3e0151d75b42774c51cf2ffe2ca4b from qemu
This commit is contained in:
Richard Henderson 2018-02-27 12:00:25 -05:00 committed by Lioncash
parent e35aacd5ae
commit 1c9c8d3f10
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qemu/cputlb.c
View file

@ -518,16 +518,16 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index,
#define MMUSUFFIX _mmu #define MMUSUFFIX _mmu
#define SHIFT 0 #define DATA_SIZE 1
#include "softmmu_template.h" #include "softmmu_template.h"
#define SHIFT 1 #define DATA_SIZE 2
#include "softmmu_template.h" #include "softmmu_template.h"
#define SHIFT 2 #define DATA_SIZE 4
#include "softmmu_template.h" #include "softmmu_template.h"
#define SHIFT 3 #define DATA_SIZE 8
#include "softmmu_template.h" #include "softmmu_template.h"
#undef MMUSUFFIX #undef MMUSUFFIX
@ -536,14 +536,14 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index,
#define GETPC() ((uintptr_t)0) #define GETPC() ((uintptr_t)0)
#define SOFTMMU_CODE_ACCESS #define SOFTMMU_CODE_ACCESS
#define SHIFT 0 #define DATA_SIZE 1
#include "softmmu_template.h" #include "softmmu_template.h"
#define SHIFT 1 #define DATA_SIZE 2
#include "softmmu_template.h" #include "softmmu_template.h"
#define SHIFT 2 #define DATA_SIZE 4
#include "softmmu_template.h" #include "softmmu_template.h"
#define SHIFT 3 #define DATA_SIZE 8
#include "softmmu_template.h" #include "softmmu_template.h"

7
qemu/softmmu_template.h
View file

@ -28,8 +28,6 @@
#include "exec/memory.h" #include "exec/memory.h"
#include "uc_priv.h" #include "uc_priv.h"
#define DATA_SIZE (1 << SHIFT)
#if DATA_SIZE == 8 #if DATA_SIZE == 8
#define SUFFIX q #define SUFFIX q
#define LSUFFIX q #define LSUFFIX q
@ -138,7 +136,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env,
} }
cpu->mem_io_vaddr = addr; cpu->mem_io_vaddr = addr;
memory_region_dispatch_read(mr, physaddr, &val, 1 << SHIFT, memory_region_dispatch_read(mr, physaddr, &val, DATA_SIZE,
iotlbentry->attrs); iotlbentry->attrs);
return (DATA_TYPE)val; return (DATA_TYPE)val;
} }
@ -547,7 +545,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env,
cpu->mem_io_vaddr = addr; cpu->mem_io_vaddr = addr;
cpu->mem_io_pc = retaddr; cpu->mem_io_pc = retaddr;
memory_region_dispatch_write(mr, physaddr, val, 1 << SHIFT, memory_region_dispatch_write(mr, physaddr, val, DATA_SIZE,
iotlbentry->attrs); iotlbentry->attrs);
} }
@ -838,7 +836,6 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
#endif /* !defined(SOFTMMU_CODE_ACCESS) */ #endif /* !defined(SOFTMMU_CODE_ACCESS) */
#undef READ_ACCESS_TYPE #undef READ_ACCESS_TYPE
#undef SHIFT
#undef DATA_TYPE #undef DATA_TYPE
#undef SUFFIX #undef SUFFIX
#undef LSUFFIX #undef LSUFFIX