summaryrefslogtreecommitdiff
path: root/src/dev/arm
diff options
context:
space:
mode:
Diffstat (limited to 'src/dev/arm')
-rw-r--r--src/dev/arm/generic_timer.cc16
-rw-r--r--src/dev/arm/generic_timer.hh10
2 files changed, 18 insertions, 8 deletions
diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc
index 1d5e8bb00..260461e33 100644
--- a/src/dev/arm/generic_timer.cc
+++ b/src/dev/arm/generic_timer.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, 2017 ARM Limited
+ * Copyright (c) 2013, 2015, 2017-2018 ARM Limited
* All rights reserved.
*
* The license below extends only to copyright in the software and shall
@@ -521,6 +521,20 @@ GenericTimer::readMiscReg(int reg, unsigned cpu)
}
+void
+GenericTimerISA::setMiscReg(int reg, MiscReg val)
+{
+ DPRINTF(Timer, "Setting %s := 0x%x\n", miscRegName[reg], val);
+ parent.setMiscReg(reg, cpu, val);
+}
+
+MiscReg
+GenericTimerISA::readMiscReg(int reg)
+{
+ MiscReg value = parent.readMiscReg(reg, cpu);
+ DPRINTF(Timer, "Reading %s as 0x%x\n", miscRegName[reg], value);
+ return value;
+}
GenericTimerMem::GenericTimerMem(GenericTimerMemParams *p)
: PioDevice(p),
diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh
index 2c5776590..1c9449e05 100644
--- a/src/dev/arm/generic_timer.hh
+++ b/src/dev/arm/generic_timer.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, 2017 ARM Limited
+ * Copyright (c) 2013, 2015, 2017-2018 ARM Limited
* All rights reserved.
*
* The license below extends only to copyright in the software and shall
@@ -318,12 +318,8 @@ class GenericTimerISA : public ArmISA::BaseISADevice
GenericTimerISA(GenericTimer &_parent, unsigned _cpu)
: parent(_parent), cpu(_cpu) {}
- void setMiscReg(int misc_reg, ArmISA::MiscReg val) override {
- parent.setMiscReg(misc_reg, cpu, val);
- }
- ArmISA::MiscReg readMiscReg(int misc_reg) override {
- return parent.readMiscReg(misc_reg, cpu);
- }
+ void setMiscReg(int misc_reg, ArmISA::MiscReg val) override;
+ ArmISA::MiscReg readMiscReg(int misc_reg) override;
protected:
GenericTimer &parent;