isa.hh (10844:8551af601f75) isa.hh (10905:a6ca6831e775)
1/*
2 * Copyright (c) 2010, 2012-2015 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 388 unchanged lines hidden (view full) ---

397 inSecureState(miscRegs[MISCREG_SCR],
398 miscRegs[MISCREG_CPSR]);
399 flat_idx += secureReg ? 2 : 1;
400 }
401 }
402 return flat_idx;
403 }
404
1/*
2 * Copyright (c) 2010, 2012-2015 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 388 unchanged lines hidden (view full) ---

397 inSecureState(miscRegs[MISCREG_SCR],
398 miscRegs[MISCREG_CPSR]);
399 flat_idx += secureReg ? 2 : 1;
400 }
401 }
402 return flat_idx;
403 }
404
405 void serialize(std::ostream &os)
405 void serialize(CheckpointOut &cp) const
406 {
407 DPRINTF(Checkpoint, "Serializing Arm Misc Registers\n");
408 SERIALIZE_ARRAY(miscRegs, NumMiscRegs);
409
410 SERIALIZE_SCALAR(haveSecurity);
411 SERIALIZE_SCALAR(haveLPAE);
412 SERIALIZE_SCALAR(haveVirtualization);
413 SERIALIZE_SCALAR(haveLargeAsid64);
414 SERIALIZE_SCALAR(physAddrRange64);
415 }
406 {
407 DPRINTF(Checkpoint, "Serializing Arm Misc Registers\n");
408 SERIALIZE_ARRAY(miscRegs, NumMiscRegs);
409
410 SERIALIZE_SCALAR(haveSecurity);
411 SERIALIZE_SCALAR(haveLPAE);
412 SERIALIZE_SCALAR(haveVirtualization);
413 SERIALIZE_SCALAR(haveLargeAsid64);
414 SERIALIZE_SCALAR(physAddrRange64);
415 }
416 void unserialize(Checkpoint *cp, const std::string &section)
416 void unserialize(CheckpointIn &cp)
417 {
418 DPRINTF(Checkpoint, "Unserializing Arm Misc Registers\n");
419 UNSERIALIZE_ARRAY(miscRegs, NumMiscRegs);
420 CPSR tmp_cpsr = miscRegs[MISCREG_CPSR];
421 updateRegMap(tmp_cpsr);
422
423 UNSERIALIZE_SCALAR(haveSecurity);
424 UNSERIALIZE_SCALAR(haveLPAE);

--- 19 unchanged lines hidden --- 		417 {
418 DPRINTF(Checkpoint, "Unserializing Arm Misc Registers\n");
419 UNSERIALIZE_ARRAY(miscRegs, NumMiscRegs);
420 CPSR tmp_cpsr = miscRegs[MISCREG_CPSR];
421 updateRegMap(tmp_cpsr);
422
423 UNSERIALIZE_SCALAR(haveSecurity);
424 UNSERIALIZE_SCALAR(haveLPAE);

--- 19 unchanged lines hidden ---