mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 03:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

cpu_ldst.h: Allow NB_MMU_MODES to be 7

Browse source 
Support guest CPUs which need 7 MMU index values.
Add a comment about what would be required to raise the limit
further (trivial for 8, TCG backend rework for 9 or more).

Backports commit 8f3ae2ae2d02727f6d56610c09d7535e43650dd4 from qemu
This commit is contained in:
Peter Maydell 2018-02-12 11:20:21 -05:00 committed by Lioncash
parent ec4dae08e4
commit 9d02c52b8a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
qemu/include/exec/cpu_ldst.h
View file

@ -290,9 +290,31 @@ uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);
#undef MEMSUFFIX #undef MEMSUFFIX
#endif /* (NB_MMU_MODES >= 6) */ #endif /* (NB_MMU_MODES >= 6) */
#if (NB_MMU_MODES > 6) #if (NB_MMU_MODES >= 7) && defined(MMU_MODE6_SUFFIX)
#error "NB_MMU_MODES > 6 is not supported for now"
#endif /* (NB_MMU_MODES > 6) */ #define CPU_MMU_INDEX 6
#define MEMSUFFIX MMU_MODE6_SUFFIX
#define DATA_SIZE 1
#include "exec/cpu_ldst_template.h"
#define DATA_SIZE 2
#include "exec/cpu_ldst_template.h"
#define DATA_SIZE 4
#include "exec/cpu_ldst_template.h"
#define DATA_SIZE 8
#include "exec/cpu_ldst_template.h"
#undef CPU_MMU_INDEX
#undef MEMSUFFIX
#endif /* (NB_MMU_MODES >= 7) */
#if (NB_MMU_MODES > 7)
/* Note that supporting NB_MMU_MODES == 9 would require
* changes to at least the ARM TCG backend.
*/
#error "NB_MMU_MODES > 7 is not supported for now"
#endif /* (NB_MMU_MODES > 7) */
/* these access are slower, they must be as rare as possible */ /* these access are slower, they must be as rare as possible */
#define CPU_MMU_INDEX (cpu_mmu_index(env)) #define CPU_MMU_INDEX (cpu_mmu_index(env))