summaryrefslogtreecommitdiff
path: root/target/alpha/machine.c
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2017-07-06 09:45:07 -1000
committerRichard Henderson <rth@twiddle.net>2017-07-18 18:41:52 -1000
commitbcd2625da578d281c710033995d0fb6ea3dff1d4 (patch)
tree5d26be91643b98fba5e25ca213449631d689cb0d /target/alpha/machine.c
parent489a0e6410899090507d9b3ee7e438511998a692 (diff)
downloadqemu-bcd2625da578d281c710033995d0fb6ea3dff1d4.tar.gz
target/alpha: Merge several flag bytes into ENV->FLAGS
The flags are arranged such that we can manipulate them either a whole, or as individual bytes. The computation within cpu_get_tb_cpu_state is now reduced to a single load and mask. Tested-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target/alpha/machine.c')
-rw-r--r--target/alpha/machine.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/target/alpha/machine.c b/target/alpha/machine.c
index a102645315..0914ba5fc1 100644
--- a/target/alpha/machine.c
+++ b/target/alpha/machine.c
@@ -48,11 +48,7 @@ static VMStateField vmstate_env_fields[] = {
VMSTATE_UINTTL(lock_addr, CPUAlphaState),
VMSTATE_UINTTL(lock_value, CPUAlphaState),
- VMSTATE_UINT8(ps, CPUAlphaState),
- VMSTATE_UINT8(intr_flag, CPUAlphaState),
- VMSTATE_UINT8(pal_mode, CPUAlphaState),
- VMSTATE_UINT8(fen, CPUAlphaState),
-
+ VMSTATE_UINT32(flags, CPUAlphaState),
VMSTATE_UINT32(pcc_ofs, CPUAlphaState),
VMSTATE_UINTTL(trap_arg0, CPUAlphaState),
@@ -74,8 +70,8 @@ static VMStateField vmstate_env_fields[] = {
static const VMStateDescription vmstate_env = {
.name = "env",
- .version_id = 2,
- .minimum_version_id = 2,
+ .version_id = 3,
+ .minimum_version_id = 3,
.fields = vmstate_env_fields,
};