aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/src/arm/interpreter
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/src/arm/interpreter')
-rw-r--r--src/core/src/arm/interpreter/arm_interpreter.cpp44
-rw-r--r--src/core/src/arm/interpreter/arm_interpreter.h7
2 files changed, 29 insertions, 22 deletions
diff --git a/src/core/src/arm/interpreter/arm_interpreter.cpp b/src/core/src/arm/interpreter/arm_interpreter.cpp
index 93050696..a74aa26c 100644
--- a/src/core/src/arm/interpreter/arm_interpreter.cpp
+++ b/src/core/src/arm/interpreter/arm_interpreter.cpp
@@ -1,26 +1,26 @@
/**
-* Copyright (C) 2013 Citrus Emulator
-*
-* @file arm_interpreter.h
-* @author bunnei
-* @date 2014-04-04
-* @brief ARM interface instance for SkyEye interprerer
-*
-* @section LICENSE
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details at
-* http://www.gnu.org/copyleft/gpl.html
-*
-* Official project repository can be found at:
-* http://code.google.com/p/gekko-gc-emu/
-*/
+ * Copyright (C) 2013 Citrus Emulator
+ *
+ * @file arm_interpreter.h
+ * @author bunnei
+ * @date 2014-04-04
+ * @brief ARM interface instance for SkyEye interprerer
+ *
+ * @section LICENSE
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details at
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * Official project repository can be found at:
+ * http://code.google.com/p/gekko-gc-emu/
+ */
#include "arm_interpreter.h"
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);
};