diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-04-07 00:57:37 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-07 00:57:37 -0400 |
| commit | f446f79da27d8c75b85772654152ea8e67a2214d (patch) | |
| tree | cf3924876405ed5244fc8ee72c8615cc74e51267 /src/core/src/arm/interpreter/arm_interpreter.h | |
| parent | 9b6041d8189653514e87135e2139fd9a0934c9bf (diff) | |
| parent | efef514fd8252e1f07cd1b45455dbb5207f2b0c3 (diff) | |
Merge branch 'hardware-interface'
Conflicts:
src/core/src/core.h
Diffstat (limited to 'src/core/src/arm/interpreter/arm_interpreter.h')
| -rw-r--r-- | src/core/src/arm/interpreter/arm_interpreter.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/src/arm/interpreter/arm_interpreter.h b/src/core/src/arm/interpreter/arm_interpreter.h index 89f871fa..074149f1 100644 --- a/src/core/src/arm/interpreter/arm_interpreter.h +++ b/src/core/src/arm/interpreter/arm_interpreter.h @@ -24,6 +24,7 @@ #pragma once +#include "common.h" #include "common_types.h" #include "arm/arm_interface.h" @@ -45,6 +46,12 @@ public: u32 CPSR(); + u64 GetTicks() { + return ARMul_Time(state); + } + private: ARMul_State* state; + + DISALLOW_COPY_AND_ASSIGN(ARM_Interpreter); }; |