types.hh (11726:11950d45640b) types.hh (12120:133620bfc43b)
1/*
2 * Copyright (c) 2013 ARM Limited
3 * Copyright (c) 2014 Sven Karlsson
4 * All rights reserved
5 *
6 * The license below extends only to copyright in the software and shall
7 * not be construed as granting a license to any other intellectual
8 * property including but not limited to intellectual property relating
9 * to a hardware implementation of the functionality of the software
10 * licensed hereunder. You may use the software subject to the license
11 * terms below provided that you ensure that this notice is replicated
12 * unmodified and in its entirety in all distributions of the software,
13 * modified or unmodified, in source code or in binary form.
14 *
1/*
2 * Copyright (c) 2013 ARM Limited
3 * Copyright (c) 2014 Sven Karlsson
4 * All rights reserved
5 *
6 * The license below extends only to copyright in the software and shall
7 * not be construed as granting a license to any other intellectual
8 * property including but not limited to intellectual property relating
9 * to a hardware implementation of the functionality of the software
10 * licensed hereunder. You may use the software subject to the license
11 * terms below provided that you ensure that this notice is replicated
12 * unmodified and in its entirety in all distributions of the software,
13 * modified or unmodified, in source code or in binary form.
14 *
15 * Copyright (c) 2016 The University of Virginia
15 * Copyright (c) 2017 The University of Virginia
16 * All rights reserved.
17 *
18 * Redistribution and use in source and binary forms, with or without
19 * modification, are permitted provided that the following conditions are
20 * met: redistributions of source code must retain the above copyright
21 * notice, this list of conditions and the following disclaimer;
22 * redistributions in binary form must reproduce the above copyright
23 * notice, this list of conditions and the following disclaimer in the

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

45
46#ifndef __ARCH_RISCV_TYPES_HH__
47#define __ARCH_RISCV_TYPES_HH__
48
49#include "arch/generic/types.hh"
50
51namespace RiscvISA
52{
16 * All rights reserved.
17 *
18 * Redistribution and use in source and binary forms, with or without
19 * modification, are permitted provided that the following conditions are
20 * met: redistributions of source code must retain the above copyright
21 * notice, this list of conditions and the following disclaimer;
22 * redistributions in binary form must reproduce the above copyright
23 * notice, this list of conditions and the following disclaimer in the

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

45
46#ifndef __ARCH_RISCV_TYPES_HH__
47#define __ARCH_RISCV_TYPES_HH__
48
49#include "arch/generic/types.hh"
50
51namespace RiscvISA
52{
53
53typedef uint32_t MachInst;
54typedef uint64_t ExtMachInst;
55
54typedef uint32_t MachInst;
55typedef uint64_t ExtMachInst;
56
56typedef GenericISA::UPCState<MachInst> PCState;
57}
57class PCState : public GenericISA::UPCState<MachInst>
58{
59 private:
60 bool _compressed;
58
61
62 public:
63 PCState() : UPCState() { _compressed = false; }
64 PCState(Addr val) : UPCState(val) { _compressed = false; }
59
65
66 void compressed(bool c) { _compressed = c; }
67 bool compressed() { return _compressed; }
68
69 bool
70 branching() const
71 {
72 if (_compressed) {
73 return npc() != pc() + sizeof(MachInst)/2 ||
74 nupc() != upc() + 1;
75 } else {
76 return npc() != pc() + sizeof(MachInst) ||
77 nupc() != upc() + 1;
78 }
79 }
80};
81
82}
83
60#endif // __ARCH_RISCV_TYPES_HH__
84#endif // __ARCH_RISCV_TYPES_HH__