ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/m68k: increase size of m68k CPU features from uint32_t to uint64_t 

There are already 32 feature bits in use, so change the size of the m68k
CPU features to uint64_t (along with the associated m68k_feature()
functions) to allow up to 64 feature bits to be used.

At the same time make use of the BIT_ULL() macro when reading/writing
the CPU feature bits to improve readability, and also update m68k_feature()
to return a bool rather than an int.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220925134804.139706-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Mark Cave-Ayland 2022-09-25 14:48:03 +01:00 committed by Laurent Vivier
parent 99d6b11b5b
commit 2dc7bf63cf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/m68k/cpu.c
View File

@ -38,12 +38,12 @@ static bool m68k_cpu_has_work(CPUState *cs)
static void m68k_set_feature(CPUM68KState *env, int feature) static void m68k_set_feature(CPUM68KState *env, int feature)
{ {
env->features |= (1u << feature); env->features |= BIT_ULL(feature);
} }
static void m68k_unset_feature(CPUM68KState *env, int feature) static void m68k_unset_feature(CPUM68KState *env, int feature)
{ {
env->features &= (-1u - (1u << feature)); env->features &= ~BIT_ULL(feature);
} }
static void m68k_cpu_reset(DeviceState *dev) static void m68k_cpu_reset(DeviceState *dev)

6
target/m68k/cpu.h
View File

@ -154,7 +154,7 @@ typedef struct CPUArchState {
struct {} end_reset_fields; struct {} end_reset_fields;
/* Fields from here on are preserved across CPU reset. */ /* Fields from here on are preserved across CPU reset. */
uint32_t features; uint64_t features;
} CPUM68KState; } CPUM68KState;
/* /*
@ -539,9 +539,9 @@ enum m68k_features {
M68K_FEATURE_TRAPCC, M68K_FEATURE_TRAPCC,
}; };
static inline int m68k_feature(CPUM68KState *env, int feature) static inline bool m68k_feature(CPUM68KState *env, int feature)
{ {
return (env->features & (1u << feature)) != 0; return (env->features & BIT_ULL(feature)) != 0;
} }
void m68k_cpu_list(void); void m68k_cpu_list(void);