diff options
| -rw-r--r-- | source.list | 3 | ||||
| -rw-r--r-- | src/cpu.cpp (renamed from src/os_timer.cpp) | 2 | ||||
| -rw-r--r-- | src/cpu.h | 21 | ||||
| -rw-r--r-- | src/debug.h | 8 |
4 files changed, 26 insertions, 8 deletions
diff --git a/source.list b/source.list index 521d30da6..d327f0dd9 100644 --- a/source.list +++ b/source.list @@ -12,6 +12,7 @@ cheat.cpp command.cpp console.cpp console_cmds.cpp +cpu.cpp crashlog.cpp currency.cpp date.cpp @@ -62,7 +63,6 @@ network/network_server.cpp network/network_udp.cpp openttd.cpp order_backup.cpp -os_timer.cpp pbs.cpp progress.cpp rail.cpp @@ -155,6 +155,7 @@ console_func.h console_gui.h console_internal.h console_type.h +cpu.h crashlog.h currency.h date_func.h diff --git a/src/os_timer.cpp b/src/cpu.cpp index 47cc1afd5..a5715b829 100644 --- a/src/os_timer.cpp +++ b/src/cpu.cpp @@ -7,7 +7,7 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. */ -/** @file os_timer.cpp OS/compiler dependant real time tick sampling. */ +/** @file cpu.cpp OS/CPU/compiler dependant real time tick sampling. */ #include "stdafx.h" diff --git a/src/cpu.h b/src/cpu.h new file mode 100644 index 000000000..528c87076 --- /dev/null +++ b/src/cpu.h @@ -0,0 +1,21 @@ +/* $Id$ */ + +/* + * This file is part of OpenTTD. + * OpenTTD 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, version 2. + * OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. + */ + +/** @file cpu.h Functions related to CPU specific instructions. */ + +#ifndef CPU_H +#define CPU_H + +/** + * Get the tick counter from the CPU (high precision timing). + * @return The count. + */ +uint64 ottd_rdtsc(); + +#endif /* CPU_H */ diff --git a/src/debug.h b/src/debug.h index f7e771719..7da72da1d 100644 --- a/src/debug.h +++ b/src/debug.h @@ -12,6 +12,8 @@ #ifndef DEBUG_H #define DEBUG_H +#include "cpu.h" + /* Debugging messages policy: * These should be the severities used for direct DEBUG() calls * maximum debugging level should be 10 if really deep, deep @@ -65,12 +67,6 @@ const char *GetDebugString(); /* Shorter form for passing filename and linenumber */ #define FILE_LINE __FILE__, __LINE__ -/** - * Get the tick counter from the CPU (high precision timing). - * @return The count. - */ -uint64 ottd_rdtsc(); - /* Used for profiling * * Usage: |