types.hh (10905:a6ca6831e775) types.hh (11168:f98eb2da15a4)
1/*
2 * Copyright (c) 2010, 2012-2013 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

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

40 * Authors: Stephen Hines
41 */
42
43#ifndef __ARCH_ARM_TYPES_HH__
44#define __ARCH_ARM_TYPES_HH__
45
46#include "arch/generic/types.hh"
47#include "base/bitunion.hh"
1/*
2 * Copyright (c) 2010, 2012-2013 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

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

40 * Authors: Stephen Hines
41 */
42
43#ifndef __ARCH_ARM_TYPES_HH__
44#define __ARCH_ARM_TYPES_HH__
45
46#include "arch/generic/types.hh"
47#include "base/bitunion.hh"
48#include "base/hashmap.hh"
49#include "base/misc.hh"
50#include "base/types.hh"
51#include "debug/Decoder.hh"
52
53namespace ArmISA
54{
55 typedef uint32_t MachInst;
56

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

478
479 bool
480 operator != (const PCState &opc) const
481 {
482 return !(*this == opc);
483 }
484
485 void
48#include "base/misc.hh"
49#include "base/types.hh"
50#include "debug/Decoder.hh"
51
52namespace ArmISA
53{
54 typedef uint32_t MachInst;
55

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

477
478 bool
479 operator != (const PCState &opc) const
480 {
481 return !(*this == opc);
482 }
483
484 void
486 serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE
485 serialize(CheckpointOut &cp) const override
487 {
488 Base::serialize(cp);
489 SERIALIZE_SCALAR(flags);
490 SERIALIZE_SCALAR(_size);
491 SERIALIZE_SCALAR(nextFlags);
492 SERIALIZE_SCALAR(_itstate);
493 SERIALIZE_SCALAR(_nextItstate);
494 }
495
496 void
486 {
487 Base::serialize(cp);
488 SERIALIZE_SCALAR(flags);
489 SERIALIZE_SCALAR(_size);
490 SERIALIZE_SCALAR(nextFlags);
491 SERIALIZE_SCALAR(_itstate);
492 SERIALIZE_SCALAR(_nextItstate);
493 }
494
495 void
497 unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE
496 unserialize(CheckpointIn &cp) override
498 {
499 Base::unserialize(cp);
500 UNSERIALIZE_SCALAR(flags);
501 UNSERIALIZE_SCALAR(_size);
502 UNSERIALIZE_SCALAR(nextFlags);
503 UNSERIALIZE_SCALAR(_itstate);
504 UNSERIALIZE_SCALAR(_nextItstate);
505 }

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

735 return false;
736 default:
737 return true;
738 }
739 }
740
741} // namespace ArmISA
742
497 {
498 Base::unserialize(cp);
499 UNSERIALIZE_SCALAR(flags);
500 UNSERIALIZE_SCALAR(_size);
501 UNSERIALIZE_SCALAR(nextFlags);
502 UNSERIALIZE_SCALAR(_itstate);
503 UNSERIALIZE_SCALAR(_nextItstate);
504 }

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

734 return false;
735 default:
736 return true;
737 }
738 }
739
740} // namespace ArmISA
741
743__hash_namespace_begin
742namespace std {
744
745template<>
746struct hash<ArmISA::ExtMachInst> :
747 public hash<ArmISA::ExtMachInst::__DataType> {
748
749 size_t operator()(const ArmISA::ExtMachInst &emi) const {
750 return hash<ArmISA::ExtMachInst::__DataType>::operator()(emi);
751 }
752
753};
754
743
744template<>
745struct hash<ArmISA::ExtMachInst> :
746 public hash<ArmISA::ExtMachInst::__DataType> {
747
748 size_t operator()(const ArmISA::ExtMachInst &emi) const {
749 return hash<ArmISA::ExtMachInst::__DataType>::operator()(emi);
750 }
751
752};
753
755__hash_namespace_end
754}
756
757#endif
755
756#endif