4 changes: 2 additions & 2 deletions Source/Core/AudioCommon/XAudio2_7Stream.cpp
View file
Expand Up @@ -7,8 +7,8 @@
// instead of other possible places. This may be accomplished by adding the path to
// the AdditionalIncludeDirectories for this file via msbuild.

#include "AudioCommon.h"
#include "XAudio2_7Stream.h"
#include "AudioCommon/AudioCommon.h"
#include "AudioCommon/XAudio2_7Stream.h"

#ifdef HAVE_DXSDK
#include <dxsdkver.h>
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/AudioCommon/XAudio2_7Stream.h
View file
Expand Up @@ -13,8 +13,8 @@
#pragma once

#include <memory>
#include "Thread.h"
#include "SoundStream.h"
#include "AudioCommon/SoundStream.h"
#include "Common/Thread.h"

#ifdef _WIN32

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/AudioCommon/aldlist.cpp
View file
Expand Up @@ -22,8 +22,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "Common.h"
#include "aldlist.h"
#include "AudioCommon/aldlist.h"
#include "Common/Common.h"
#ifdef _WIN32
#include "../../../Externals/OpenAL/include/al.h"
#include "../../../Externals/OpenAL/include/alc.h"
Expand Down
8 changes: 5 additions & 3 deletions Source/Core/AudioCommon/aldlist.h
View file
@@ -1,12 +1,14 @@
#pragma once

#include "CommonTypes.h"
#include <string>
#include <vector>

#include "Common/CommonTypes.h"

#ifdef _WIN32
#pragma warning(disable: 4786) //disable warning "identifier was truncated to
//'255' characters in the browser information"
#endif
#include <vector>
#include <string>

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/AudioCommon/stdafx.cpp
View file
Expand Up @@ -2,4 +2,4 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "stdafx.h"
#include "AudioCommon/stdafx.h"
25 changes: 6 additions & 19 deletions Source/Core/Common/ArmCPUDetect.cpp
View file
@@ -1,23 +1,10 @@
// Copyright (C) 2003 Dolphin Project.
// Copyright 2014 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.

// 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, version 2.0.

// 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 2.0 for more details.

// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/

// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/

#include "Common.h"
#include "CPUDetect.h"
#include "FileUtil.h"
#include "Common/Common.h"
#include "Common/CPUDetect.h"
#include "Common/FileUtil.h"

// Only Linux platforms have /proc/cpuinfo
#if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)
Expand Down
27 changes: 7 additions & 20 deletions Source/Core/Common/ArmEmitter.cpp
View file
@@ -1,27 +1,14 @@
// Copyright (C) 2003 Dolphin Project.

// 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, version 2.0.

// 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 2.0 for more details.

// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/

// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/

#include "Common.h"
#include "ArmEmitter.h"
#include "CPUDetect.h"
// Copyright 2014 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <assert.h>
#include <stdarg.h>

#include "Common/ArmEmitter.h"
#include "Common/Common.h"
#include "Common/CPUDetect.h"

// For cache flushing on Symbian/iOS/Blackberry
#ifdef __SYMBIAN32__
#include <e32std.h>
Expand Down
10 changes: 6 additions & 4 deletions Source/Core/Common/ArmEmitter.h
View file
@@ -1,17 +1,19 @@
// Copyright 2013 Dolphin Emulator Project
// Copyright 2014 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.

// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!

#pragma once

#include "Common.h"
#include "MemoryUtil.h"
#include <vector>

#include "Common/Common.h"
#include "Common/MemoryUtil.h"

#if defined(__SYMBIAN32__) || defined(PANDORA)
#include <signal.h>
#endif
#include <vector>

#undef _IP
#undef R0
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/Atomic.h
View file
Expand Up @@ -6,11 +6,11 @@

#ifdef _WIN32

#include "Atomic_Win32.h"
#include "Common/Atomic_Win32.h"

#else

// GCC-compatible compiler assumed!
#include "Atomic_GCC.h"
#include "Common/Atomic_GCC.h"

#endif
2 changes: 1 addition & 1 deletion Source/Core/Common/Atomic_GCC.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

// Atomic operations are performed in a single step by the CPU. It is
// impossible for other threads to see the operation "half-done."
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/Common/Atomic_Win32.h
View file
Expand Up @@ -4,10 +4,11 @@

#pragma once

#include "Common.h"
#include <intrin.h>
#include <Windows.h>

#include "Common/Common.h"

// Atomic operations are performed in a single step by the CPU. It is
// impossible for other threads to see the operation "half-done."
//
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Common/BreakPoints.cpp
View file
Expand Up @@ -2,13 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "DebugInterface.h"
#include "BreakPoints.h"
#include "../Core/PowerPC/JitCommon/JitBase.h"

#include <sstream>

#include "Common/BreakPoints.h"
#include "Common/Common.h"
#include "Common/DebugInterface.h"
#include "Core/PowerPC/JitCommon/JitBase.h"

bool BreakPoints::IsAddressBreakPoint(u32 _iAddress)
{
for (const TBreakPoint& bp : m_BreakPoints)
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/BreakPoints.h
View file
Expand Up @@ -4,10 +4,10 @@

#pragma once

#include <vector>
#include <string>
#include <vector>

#include "CommonTypes.h"
#include "Common/CommonTypes.h"

class DebugInterface;

Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Common/CDUtils.cpp
View file
@@ -1,13 +1,13 @@
// Most of the code in this file was shamelessly ripped from libcdio With minor adjustments

#include "CDUtils.h"
#include "Common.h"
#include "StringUtil.h"

#include <memory> // for std::unique_ptr

#include "Common/CDUtils.h"
#include "Common/Common.h"
#include "Common/StringUtil.h"

#ifdef _WIN32
#include <windows.h>
#include "StringUtil.h"
#elif __APPLE__
#include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOBSD.h>
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/CDUtils.h
View file
@@ -1,7 +1,7 @@
#pragma once

#include <vector>
#include <string>
#include <vector>

// Returns a pointer to an array of strings with the device names
std::vector<std::string> cdio_get_devices();
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Common/ChunkFile.h
View file
Expand Up @@ -13,16 +13,16 @@
// - Zero backwards/forwards compatibility
// - Serialization code for anything complex has to be manually written.

#include <deque>
#include <list>
#include <map>
#include <set>
#include <vector>
#include <list>
#include <deque>
#include <string>
#include <type_traits>
#include <vector>

#include "Common.h"
#include "FileUtil.h"
#include "Common/Common.h"
#include "Common/FileUtil.h"

// ewww
#if _LIBCPP_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/ColorUtil.cpp
View file
Expand Up @@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "ColorUtil.h"
#include "Common/ColorUtil.h"
#include "Common/Common.h"

namespace ColorUtil
{
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/Common/ColorUtil.h
View file
Expand Up @@ -4,6 +4,8 @@

#pragma once

#include "Common/CommonTypes.h"

namespace ColorUtil
{

Expand Down
15 changes: 7 additions & 8 deletions Source/Core/Common/Common.h
View file
Expand Up @@ -7,9 +7,9 @@
// DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file
// since it slows down the build a lot.

#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <cstdio>
#include <cstdlib>
#include <cstring>

// SVN version number
extern const char *scm_desc_str;
Expand Down Expand Up @@ -45,10 +45,6 @@ class NonCopyable
};
#endif

#include "Log.h"
#include "CommonTypes.h"
#include "MsgHandler.h"

#ifdef __APPLE__
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
// This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
Expand Down Expand Up @@ -172,4 +168,7 @@ enum EMUSTATE_CHANGE
EMUSTATE_CHANGE_STOP
};

#include "CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/CommonFuncs.h" // NOLINT: needs to be included after CommonTypes
#include "Common/Log.h"
#include "Common/MsgHandler.h"
3 changes: 2 additions & 1 deletion Source/Core/Common/CommonFuncs.h
View file
Expand Up @@ -11,9 +11,10 @@
#define SLEEP(x) usleep(x*1000)
#endif

#include <clocale>
#include <cstddef>
#include <type_traits>
#include "Common.h"
#include "Common/CommonTypes.h"

// Will fail to compile on a non-array:
// TODO: make this a function when constexpr is available
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/CommonPaths.h
View file
Expand Up @@ -5,7 +5,7 @@
#pragma once

// Make sure we pick up USER_DIR if set in config.h
#include "Common.h"
#include "Common/Common.h"

// Directory seperators, do we need this?
#define DIR_SEP "/"
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/CommonTypes.h
View file
Expand Up @@ -9,8 +9,8 @@

#pragma once

#include <cstdint>
#include <cstddef>
#include <cstdint>

#ifdef _WIN32

Expand Down
7 changes: 4 additions & 3 deletions Source/Core/Common/Crypto/bn.cpp
View file
Expand Up @@ -2,10 +2,11 @@
// Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

#include <cstdio>
#include <string.h>
#include <stdio.h>
#include "../Common.h"
#include "tools.h"

#include "Common/Common.h"
#include "Common/Crypto/tools.h"

/*static void bn_print(char *name, u8 *a, u32 n)
{
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Common/Crypto/ec.cpp
View file
Expand Up @@ -6,13 +6,13 @@
// Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

#include <cstdio>
#include <cstdlib>
#include <ctime>
#include <string.h>
#include <stdio.h>
#include <time.h>
#include <stdlib.h>

#include "../Common.h"
#include "tools.h"
#include "Common/Common.h"
#include "Common/Crypto/tools.h"
// y**2 + x*y = x**3 + x + b
/*
static u8 ec_b[30] =
Expand Down
7 changes: 4 additions & 3 deletions Source/Core/Common/ExtendedTrace.cpp
View file
Expand Up @@ -14,10 +14,11 @@

#if defined(WIN32)

#include <cstdio>
#include <windows.h>
#include <stdio.h>
#include "ExtendedTrace.h"
#include "StringUtil.h"

#include "Common/ExtendedTrace.h"
#include "Common/StringUtil.h"
using namespace std;

#include <tchar.h>
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/FPURoundMode.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "CommonTypes.h"
#include "Common/CommonTypes.h"

namespace FPURoundMode
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/FifoQueue.h
View file
Expand Up @@ -3,7 +3,7 @@
// a simple lockless thread-safe,
// single reader, single writer queue

#include "Atomic.h"
#include "Common/Atomic.h"

namespace Common
{
Expand Down
13 changes: 6 additions & 7 deletions Source/Core/Common/FileSearch.cpp
View file
Expand Up @@ -2,21 +2,20 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <algorithm>

#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileSearch.h"
#include "Common/StringUtil.h"

#include "Common.h"
#include "CommonPaths.h"
#ifndef _WIN32
#include <sys/types.h>
#include <dirent.h>
#else
#include <windows.h>
#endif

#include <algorithm>

#include "FileSearch.h"
#include "StringUtil.h"


CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)
{
Expand Down
27 changes: 13 additions & 14 deletions Source/Core/Common/FileUtil.cpp
View file
Expand Up @@ -2,36 +2,35 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <algorithm>
#include <fcntl.h>
#include <sys/stat.h>

#include "CommonPaths.h"
#include "FileUtil.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"

#ifdef _WIN32
#include <windows.h>
#include <shlobj.h> // for SHGetFolderPath
#include <shellapi.h>
#include <commdlg.h> // for GetSaveFileName
#include <io.h>
#include <direct.h> // getcwd
#include <io.h>
#include <shellapi.h>
#include <shlobj.h> // for SHGetFolderPath
#include <windows.h>
#else
#include <sys/param.h>
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
#include <stdlib.h>
#include <libgen.h>
#include <stdlib.h>
#include <sys/param.h>
#include <sys/types.h>
#endif
#include <fcntl.h>

#if defined(__APPLE__)
#include <CoreFoundation/CFBundle.h>
#include <CoreFoundation/CFString.h>
#include <CoreFoundation/CFURL.h>
#include <CoreFoundation/CFBundle.h>
#endif

#include <algorithm>
#include <sys/stat.h>

#ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
#endif
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Common/FileUtil.h
View file
Expand Up @@ -4,14 +4,14 @@

#pragma once

#include <fstream>
#include <cstdio>
#include <fstream>
#include <string>
#include <vector>
#include <string.h>
#include <vector>

#include "Common.h"
#include "StringUtil.h"
#include "Common/Common.h"
#include "Common/StringUtil.h"

// User directory indices for GetUserPath
enum {
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/Hash.cpp
View file
Expand Up @@ -3,9 +3,9 @@
// Refer to the license.txt file included.


#include "Hash.h"
#include "Common/Hash.h"
#if _M_SSE >= 0x402
#include "CPUDetect.h"
#include "Common/CPUDetect.h"
#include <nmmintrin.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/Hash.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0.
u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower
Expand Down
17 changes: 8 additions & 9 deletions Source/Core/Common/IniFile.cpp
View file
Expand Up @@ -5,18 +5,17 @@

// see IniFile.h

#include <stdlib.h>
#include <stdio.h>

#include <algorithm>
#include <cstdio>
#include <cstdlib>
#include <fstream>
#include <iostream>
#include <string>
#include <vector>
#include <iostream>
#include <fstream>
#include <algorithm>

#include "FileUtil.h"
#include "StringUtil.h"
#include "IniFile.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Common/StringUtil.h"

namespace {

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/IniFile.h
View file
Expand Up @@ -5,11 +5,11 @@
#pragma once

#include <map>
#include <string>
#include <set>
#include <string>
#include <vector>

#include "StringUtil.h"
#include "Common/StringUtil.h"

struct CaseInsensitiveStringCompare
{
Expand Down
4 changes: 3 additions & 1 deletion Source/Core/Common/LinearDiskCache.h
View file
Expand Up @@ -4,9 +4,11 @@

#pragma once

#include "Common.h"
#include <fstream>

#include "Common/Common.h"
#include "Common/FileUtil.h"

// On disk format:
//header{
// u32 'DCAC';
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Common/LogManager.cpp
View file
Expand Up @@ -5,12 +5,12 @@
#include <algorithm>

#ifdef ANDROID
#include "Host.h"
#include "Core/Host.h"
#endif
#include "LogManager.h"
#include "Timer.h"
#include "Thread.h"
#include "FileUtil.h"
#include "Common/FileUtil.h"
#include "Common/LogManager.h"
#include "Common/Thread.h"
#include "Common/Timer.h"

void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
const char *file, int line, const char* fmt, ...)
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Common/LogManager.h
View file
Expand Up @@ -4,14 +4,14 @@

#pragma once

#include "Log.h"
#include "StringUtil.h"
#include "Thread.h"
#include "FileUtil.h"

#include <set>
#include <string.h>

#include "Common/FileUtil.h"
#include "Common/Log.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"

#define MAX_MESSAGES 8000
#define MAX_MSGLEN 1024

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/MathUtil.cpp
View file
Expand Up @@ -2,11 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "MathUtil.h"

#include <cmath>
#include <numeric>

#include "Common/MathUtil.h"

namespace MathUtil
{

Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Common/MathUtil.h
View file
Expand Up @@ -4,10 +4,10 @@

#pragma once

#include "Common.h"

#include <vector>
#include "FPURoundMode.h"

#include "Common/Common.h"
#include "Common/FPURoundMode.h"

namespace MathUtil
{
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Common/MemArena.cpp
View file
Expand Up @@ -4,9 +4,9 @@

#include <set>

#include "MemoryUtil.h"
#include "MemArena.h"
#include "StringUtil.h"
#include "Common/MemArena.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"

#ifdef _WIN32
#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/MemArena.h
View file
Expand Up @@ -8,7 +8,7 @@
#include <windows.h>
#endif

#include "Common.h"
#include "Common/Common.h"

// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
// Multiple views can mirror the same section of the block, which makes it very convenient for emulating
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Common/MemoryUtil.cpp
View file
Expand Up @@ -3,9 +3,9 @@
// Refer to the license.txt file included.


#include "Common.h"
#include "MemoryUtil.h"
#include "StringUtil.h"
#include "Common/Common.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"

#ifdef _WIN32
#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/Misc.cpp
View file
Expand Up @@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "Common/Common.h"

// Neither Android nor OS X support TLS
#if defined(__APPLE__) || (ANDROID && __clang__)
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Common/MsgHandler.cpp
View file
Expand Up @@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <stdio.h> // System
#include <cstdio>

#include "Common.h" // Local
#include "StringUtil.h"
#include "Common/Common.h"
#include "Common/StringUtil.h"

bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
static MsgAlertHandler msg_handler = DefaultMsgHandler;
Expand Down
7 changes: 4 additions & 3 deletions Source/Core/Common/NandPaths.cpp
View file
Expand Up @@ -2,11 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "CommonPaths.h"
#include "FileUtil.h"
#include "NandPaths.h"
#include <fstream>

#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/NandPaths.h"

namespace Common
{

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/NandPaths.h
View file
Expand Up @@ -5,7 +5,7 @@
#pragma once

#include <string>
#include "CommonTypes.h"
#include "Common/CommonTypes.h"

#define TITLEID_SYSMENU 0x0000000100000002ull

Expand Down
16 changes: 8 additions & 8 deletions Source/Core/Common/SDCardUtil.cpp
View file
Expand Up @@ -28,15 +28,15 @@
// A simple and portable piece of code used to generate a blank FAT32 image file.
// Modified for Dolphin.

#include "SDCardUtil.h"
#include "FileUtil.h"

#include <time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <cinttypes>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <ctime>
#include <errno.h>

#include "Common/FileUtil.h"
#include "Common/SDCardUtil.h"

#ifndef _WIN32
#include <unistd.h> // for unlink()
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/SDCardUtil.h
View file
Expand Up @@ -4,6 +4,6 @@

#pragma once

#include "CommonTypes.h"
#include "Common/CommonTypes.h"

bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename);
12 changes: 6 additions & 6 deletions Source/Core/Common/SettingsHandler.cpp
View file
Expand Up @@ -4,20 +4,20 @@

// Thanks to Treeki for writing the original class - 29/01/2012

#include "CommonPaths.h"
#include "Timer.h"
#include "SettingsHandler.h"

#include <time.h>
#include <ctime>

#ifdef _WIN32
#include <Windows.h>
#include <mmsystem.h>
#include <sys/timeb.h>
#include <windows.h>
#else
#include <sys/time.h>
#endif

#include "Common/CommonPaths.h"
#include "Common/SettingsHandler.h"
#include "Common/Timer.h"

SettingsHandler::SettingsHandler()
{
Reset();
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/SettingsHandler.h
View file
Expand Up @@ -8,7 +8,7 @@

#include <string>

#include "CommonTypes.h"
#include "Common/CommonTypes.h"

class SettingsHandler
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/StdConditionVariable.h
View file
Expand Up @@ -36,7 +36,7 @@

// partial std::condition_variable implementation for win32/pthread

#include "StdMutex.h"
#include "Common/StdMutex.h"

#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
#define USE_RVALUE_REFERENCES
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Common/StringUtil.cpp
View file
Expand Up @@ -2,12 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <stdlib.h>
#include <stdio.h>
#include <algorithm>
#include <cstdio>
#include <cstdlib>

#include "CommonPaths.h"
#include "StringUtil.h"
#include "Common/CommonPaths.h"
#include "Common/StringUtil.h"

#ifdef _WIN32
#include <Windows.h>
Expand Down
11 changes: 5 additions & 6 deletions Source/Core/Common/StringUtil.h
View file
Expand Up @@ -4,14 +4,13 @@

#pragma once

#include <stdarg.h>

#include <vector>
#include <string>
#include <sstream>
#include <cstdarg>
#include <iomanip>
#include <sstream>
#include <string>
#include <vector>

#include "Common.h"
#include "Common/Common.h"

std::string StringFromFormat(const char* format, ...)
#if !defined _WIN32
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/SymbolDB.cpp
View file
Expand Up @@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "SymbolDB.h"
#include "Common/SymbolDB.h"


void SymbolDB::List()
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/SymbolDB.h
View file
Expand Up @@ -7,11 +7,11 @@

#pragma once

#include <string>
#include <map>
#include <string>
#include <vector>

#include "Common.h"
#include "Common/Common.h"

struct SCall
{
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Common/SysConf.cpp
View file
Expand Up @@ -2,11 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "FileUtil.h"
#include "SysConf.h"

#include <cinttypes>

#include "Common/FileUtil.h"
#include "Common/SysConf.h"

SysConf::SysConf()
: m_IsValid(false)
{
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/Common/SysConf.h
View file
Expand Up @@ -7,6 +7,8 @@
#include <string>
#include <vector>

#include "Common/Common.h"

// This class is meant to edit the values in a given Wii SYSCONF file
// It currently does not add/remove/rearrange sections,
// instead only modifies exiting sections' data
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/Thread.cpp
View file
Expand Up @@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Thread.h"
#include "Common.h"
#include "Common/Common.h"
#include "Common/Thread.h"

#ifdef __APPLE__
#include <mach/mach.h>
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/Common/Thread.h
View file
Expand Up @@ -4,14 +4,14 @@

#pragma once

#include "StdConditionVariable.h"
#include "StdMutex.h"
#include "StdThread.h"
#include <cstdio>
#include <cstring>

// Don't include common.h here as it will break LogManager
#include "CommonTypes.h"
#include <stdio.h>
#include <string.h>
#include "Common/CommonTypes.h"
#include "Common/StdConditionVariable.h"
#include "Common/StdMutex.h"
#include "Common/StdThread.h"

// This may not be defined outside _WIN32
#ifndef _WIN32
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Common/Timer.cpp
View file
Expand Up @@ -2,19 +2,19 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <time.h>
#include <cinttypes>
#include <ctime>

#ifdef _WIN32
#include <Windows.h>
#include <mmsystem.h>
#include <sys/timeb.h>
#include <windows.h>
#else
#include <sys/time.h>
#endif

#include "Timer.h"
#include "StringUtil.h"
#include "Common/StringUtil.h"
#include "Common/Timer.h"

namespace Common
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/Timer.h
View file
Expand Up @@ -4,8 +4,8 @@

#pragma once

#include "CommonTypes.h"
#include <string>
#include "Common/CommonTypes.h"

namespace Common
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/Version.cpp
View file
Expand Up @@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "scmrev.h"
#include "Common/Common.h"

#ifdef _DEBUG
#define BUILD_TYPE_STR "Debug "
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/stdafx.cpp
View file
Expand Up @@ -2,4 +2,4 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "stdafx.h"
#include "Common/stdafx.h"
2 changes: 1 addition & 1 deletion Source/Core/Common/stdafx.h
View file
Expand Up @@ -18,7 +18,7 @@
#define _CRT_SECURE_NO_DEPRECATE 1
#define _CRT_NONSTDC_NO_DEPRECATE 1
*/
#include <windows.h>
#include <tchar.h>
#include <vector>
#include <windows.h>

4 changes: 2 additions & 2 deletions Source/Core/Common/x64ABI.cpp
View file
Expand Up @@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "x64ABI.h"
#include "x64Emitter.h"
#include "Common/x64ABI.h"
#include "Common/x64Emitter.h"

using namespace Gen;

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/x64ABI.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

// x86/x64 ABI:s, and helpers to help follow them when JIT-ing code.
// All convensions return values in EAX (+ possibly EDX).
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/x64Analyzer.cpp
View file
Expand Up @@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "x64Analyzer.h"
#include "Common/x64Analyzer.h"

bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/x64Analyzer.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "CommonTypes.h"
#include "Common/CommonTypes.h"

struct InstructionInfo
{
Expand Down
11 changes: 5 additions & 6 deletions Source/Core/Common/x64CPUDetect.cpp
View file
Expand Up @@ -2,8 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <memory.h>
#include "Common.h"
#include <memory>

#include "Common/Common.h"
#include "Common/CPUDetect.h"
#include "Common/StringUtil.h"

#ifdef _WIN32
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
Expand Down Expand Up @@ -85,10 +88,6 @@ static unsigned long long _xgetbv(unsigned int index)

#endif

#include "Common.h"
#include "CPUDetect.h"
#include "StringUtil.h"

CPUInfo cpu_info;

CPUInfo::CPUInfo() {
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Common/x64Emitter.cpp
View file
Expand Up @@ -2,13 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "x64Emitter.h"
#include "x64ABI.h"
#include "CPUDetect.h"

#include <cinttypes>

#include "Common/Common.h"
#include "Common/CPUDetect.h"
#include "Common/x64ABI.h"
#include "Common/x64Emitter.h"

namespace Gen
{

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Common/x64Emitter.h
View file
Expand Up @@ -6,8 +6,8 @@

#pragma once

#include "Common.h"
#include "MemoryUtil.h"
#include "Common/Common.h"
#include "Common/MemoryUtil.h"

namespace Gen
{
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Common/x64FPURoundMode.cpp
View file
Expand Up @@ -2,9 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "FPURoundMode.h"
#include "CPUDetect.h"
#include "Common/Common.h"
#include "Common/CPUDetect.h"
#include "Common/FPURoundMode.h"

#ifndef _WIN32
static const unsigned short FPU_ROUND_NEAR = 0 << 10;
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/ARDecrypt.cpp
View file
Expand Up @@ -6,14 +6,14 @@
// GCNcrypt - Gamecube AR Crypto Program
// Copyright (C) 2003-2004 Parasyte


#include "ARDecrypt.h"
#include <algorithm>

#ifdef _WIN32
#include <windows.h>
#endif

#include "Core/ARDecrypt.h"

namespace ActionReplay
{

Expand Down
5 changes: 3 additions & 2 deletions Source/Core/Core/ARDecrypt.h
View file
Expand Up @@ -5,8 +5,9 @@
#pragma once

#include <vector>
#include "Common.h"
#include "ActionReplay.h"

#include "Common/Common.h"
#include "Core/ActionReplay.h"

namespace ActionReplay
{
Expand Down
17 changes: 9 additions & 8 deletions Source/Core/Core/ActionReplay.cpp
View file
Expand Up @@ -22,14 +22,15 @@
#include <string>
#include <vector>

#include "Common.h"
#include "StringUtil.h"
#include "HW/Memmap.h"
#include "ActionReplay.h"
#include "Core.h"
#include "ARDecrypt.h"
#include "LogManager.h"
#include "ConfigManager.h"
#include "Common/Common.h"
#include "Common/LogManager.h"
#include "Common/StringUtil.h"

#include "Core/ActionReplay.h"
#include "Core/ARDecrypt.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h"

namespace ActionReplay
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/ActionReplay.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "IniFile.h"
#include "Common/IniFile.h"

namespace ActionReplay
{
Expand Down
35 changes: 11 additions & 24 deletions Source/Core/Core/ArmMemTools.cpp
View file
@@ -1,36 +1,23 @@
// Copyright (C) 2003 Dolphin Project.
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.

// 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, version 2.0.

// 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 2.0 for more details.

// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/

// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/


#include <stdio.h>
#include <cstdio>
#include <signal.h>
#ifdef ANDROID
#include <asm/sigcontext.h>
#else
#include <sys/ucontext.h> // Look in here for the context definition.
#include <execinfo.h>
#include <sys/ucontext.h> // Look in here for the context definition.
#endif

#include "Common.h"
#include "MemTools.h"
#include "HW/Memmap.h"
#include "PowerPC/PowerPC.h"
#include "PowerPC/JitInterface.h"
#include "PowerPC/JitCommon/JitBase.h"
#include "Common/Common.h"
#include "Core/MemTools.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/JitCommon/JitBase.h"

namespace EMM
{
Expand Down
60 changes: 29 additions & 31 deletions Source/Core/Core/Boot/Boot.cpp
View file
Expand Up @@ -3,37 +3,35 @@
// Refer to the license.txt file included.


#include "Common.h" // Common
#include "StringUtil.h"
#include "FileUtil.h"
#include "MathUtil.h"

#include "../HLE/HLE.h" // Core
#include "../PowerPC/PowerPC.h"
#include "../PowerPC/PPCAnalyst.h"
#include "../Core.h"
#include "../HW/EXI_DeviceIPL.h"
#include "../HW/Memmap.h"
#include "../HW/ProcessorInterface.h"
#include "../HW/DVDInterface.h"
#include "../HW/VideoInterface.h"
#include "../IPC_HLE/WII_IPC_HLE.h"

#include "../Debugger/Debugger_SymbolMap.h" // Debugger

#include "Boot_DOL.h"
#include "Boot.h"
#include "../Host.h"
#include "../VolumeHandler.h"
#include "../PatchEngine.h"
#include "../PowerPC/SignatureDB.h"
#include "../PowerPC/PPCSymbolDB.h"

#include "../ConfigManager.h"
#include "VolumeCreator.h" // DiscIO
#include "NANDContentLoader.h"
#include "Hash.h"
#include "CommonPaths.h"
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/Hash.h"
#include "Common/MathUtil.h"
#include "Common/StringUtil.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/PatchEngine.h"
#include "Core/VolumeHandler.h"
#include "Core/Boot/Boot.h"
#include "Core/Boot/Boot_DOL.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/VideoInterface.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/SignatureDB.h"

#include "DiscIO/NANDContentLoader.h"
#include "DiscIO/VolumeCreator.h"

void CBoot::Load_FST(bool _bIsWii)
{
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/Boot/Boot.h
View file
Expand Up @@ -7,9 +7,9 @@
#include <cstdlib>
#include <string>

#include "../CoreParameter.h"
#include "Core/CoreParameter.h"

#include "Volume.h"
#include "DiscIO/Volume.h"
using DiscIO::IVolume;

typedef struct CountrySetting
Expand Down
41 changes: 20 additions & 21 deletions Source/Core/Core/Boot/Boot_BS2Emu.cpp
View file
Expand Up @@ -2,27 +2,26 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "CommonPaths.h"
#include "FileUtil.h"
#include "NandPaths.h"

#include "../PowerPC/PowerPC.h"
#include "../Core.h"
#include "../HW/EXI_DeviceIPL.h"
#include "../HW/Memmap.h"
#include "../HW/DVDInterface.h"
#include "../HW/CPU.h"

#include "../VolumeHandler.h"
#include "../PatchEngine.h"
#include "../MemTools.h"

#include "../ConfigManager.h"
#include "VolumeCreator.h"
#include "Boot.h"
#include "HLE/HLE.h"
#include "SettingsHandler.h"
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/NandPaths.h"
#include "Common/SettingsHandler.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/MemTools.h"
#include "Core/PatchEngine.h"
#include "Core/VolumeHandler.h"
#include "Core/Boot/Boot.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"

#include "DiscIO/VolumeCreator.h"

void CBoot::RunFunction(u32 _iAddr)
{
Expand Down
9 changes: 5 additions & 4 deletions Source/Core/Core/Boot/Boot_DOL.cpp
View file
Expand Up @@ -2,10 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Boot_DOL.h"
#include "FileUtil.h"
#include "../HW/Memmap.h"
#include "CommonFuncs.h"
#include "Common/CommonFuncs.h"
#include "Common/FileUtil.h"

#include "Core/Boot/Boot_DOL.h"
#include "Core/HW/Memmap.h"

CDolLoader::CDolLoader(u8* _pBuffer, u32 _Size)
: m_isWii(false)
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Boot/Boot_DOL.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "CommonTypes.h"
#include "Common/CommonTypes.h"

class CDolLoader
{
Expand Down
13 changes: 7 additions & 6 deletions Source/Core/Core/Boot/Boot_ELF.cpp
View file
Expand Up @@ -2,12 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "../PowerPC/PowerPC.h"
#include "Boot.h"
#include "../HLE/HLE.h"
#include "Boot_ELF.h"
#include "ElfReader.h"
#include "FileUtil.h"
#include "Common/FileUtil.h"

#include "Core/Boot/Boot.h"
#include "Core/Boot/Boot_ELF.h"
#include "Core/Boot/ElfReader.h"
#include "Core/HLE/HLE.h"
#include "Core/PowerPC/PowerPC.h"

bool CBoot::IsElfWii(const char *filename)
{
Expand Down
35 changes: 18 additions & 17 deletions Source/Core/Core/Boot/Boot_WiiWAD.cpp
View file
Expand Up @@ -2,25 +2,26 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Boot.h"
#include "../PowerPC/PowerPC.h"
#include "../HLE/HLE.h"
#include "../HW/Memmap.h"
#include "../ConfigManager.h"
#include "../PatchEngine.h"
#include "../IPC_HLE/WII_IPC_HLE.h"
#include "../IPC_HLE/WII_IPC_HLE_Device_FileIO.h"

#include "WiiWad.h"
#include "NANDContentLoader.h"
#include "FileUtil.h"
#include "Boot_DOL.h"
#include "Volume.h"
#include "VolumeCreator.h"
#include "CommonPaths.h"

#include <memory>

#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"

#include "Core/ConfigManager.h"
#include "Core/PatchEngine.h"
#include "Core/Boot/Boot.h"
#include "Core/Boot/Boot_DOL.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
#include "Core/PowerPC/PowerPC.h"

#include "DiscIO/NANDContentLoader.h"
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeCreator.h"
#include "DiscIO/WiiWad.h"

static u32 state_checksum(u32 *buf, int len)
{
u32 checksum = 0;
Expand Down
11 changes: 6 additions & 5 deletions Source/Core/Core/Boot/ElfReader.cpp
View file
Expand Up @@ -4,11 +4,12 @@

#include <string>

#include "Common.h"
#include "../Debugger/Debugger_SymbolMap.h"
#include "../HW/Memmap.h"
#include "../PowerPC/PPCSymbolDB.h"
#include "ElfReader.h"
#include "Common/Common.h"

#include "Core/Boot/ElfReader.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PPCSymbolDB.h"

void bswap(Elf32_Word &w) {w = Common::swap32(w);}
void bswap(Elf32_Half &w) {w = Common::swap16(w);}
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Boot/ElfReader.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "ElfTypes.h"
#include "Core/Boot/ElfTypes.h"

enum KnownElfTypes
{
Expand Down
32 changes: 16 additions & 16 deletions Source/Core/Core/BootManager.cpp
View file
Expand Up @@ -23,22 +23,22 @@
#include <string>
#include <vector>

#include "CommonTypes.h"
#include "CommonPaths.h"
#include "IniFile.h"
#include "BootManager.h"
#include "Volume.h"
#include "VolumeCreator.h"
#include "ConfigManager.h"
#include "SysConf.h"
#include "Core.h"
#include "Host.h"
#include "VideoBackendBase.h"
#include "Movie.h"
#include "NetPlayProto.h"
#include "HW/WiimoteReal/WiimoteReal.h"
#include "HW/SI.h"
#include "HW/EXI.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/IniFile.h"
#include "Common/SysConf.h"
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"
#include "Core/HW/EXI.h"
#include "Core/HW/SI.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeCreator.h"
#include "VideoCommon/VideoBackendBase.h"

namespace BootManager
{
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/Core/ConfigManager.cpp
View file
Expand Up @@ -2,13 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "CommonPaths.h"
#include "ConfigManager.h"
#include "IniFile.h"
#include "FileUtil.h"
#include "NANDContentLoader.h"
#include "HW/SI.h"
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Core/ConfigManager.h"
#include "Core/HW/SI.h"
#include "DiscIO/NANDContentLoader.h"

SConfig* SConfig::m_Instance;

Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/ConfigManager.h
View file
Expand Up @@ -7,10 +7,10 @@
#include <string>
#include <vector>

#include "Boot/Boot.h"
#include "HW/EXI_Device.h"
#include "HW/SI_Device.h"
#include "SysConf.h"
#include "Common/SysConf.h"
#include "Core/Boot/Boot.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/SI_Device.h"

// DSP Backend Types
#define BACKEND_NULLSOUND _trans("No audio output")
Expand Down
97 changes: 47 additions & 50 deletions Source/Core/Core/Core.cpp
View file
Expand Up @@ -4,62 +4,59 @@

#ifdef _WIN32
#include <windows.h>
#include "EmuWindow.h"
#include "VideoCommon/EmuWindow.h"
#endif

#include "Atomic.h"
#include "Thread.h"
#include "Timer.h"
#include "Common.h"
#include "CommonPaths.h"
#include "StringUtil.h"
#include "MathUtil.h"
#include "MemoryUtil.h"

#include "Core.h"
#include "CPUDetect.h"
#include "CoreTiming.h"
#include "Boot/Boot.h"
#include "FifoPlayer/FifoPlayer.h"

#include "HW/Memmap.h"
#include "HW/ProcessorInterface.h"
#include "HW/GPFifo.h"
#include "HW/CPU.h"
#include "HW/GCPad.h"
#include "HW/Wiimote.h"
#include "HW/HW.h"
#include "HW/DSP.h"
#include "HW/GPFifo.h"
#include "HW/AudioInterface.h"
#include "HW/VideoInterface.h"
#include "HW/EXI.h"
#include "HW/SystemTimers.h"

#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"

#include "PowerPC/PowerPC.h"
#include "AudioCommon/AudioCommon.h"

#include "Common/Atomic.h"
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/CPUDetect.h"
#include "Common/LogManager.h"
#include "Common/MathUtil.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Common/Timer.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/DSPEmulator.h"
#include "Core/Host.h"
#include "Core/MemTools.h"
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"
#include "Core/PatchEngine.h"
#include "Core/State.h"
#include "Core/VolumeHandler.h"
#include "Core/Boot/Boot.h"
#include "Core/FifoPlayer/FifoPlayer.h"

#include "Core/HW/AudioInterface.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
#include "Core/HW/EXI.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/GPFifo.h"
#include "Core/HW/HW.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h"
#include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/PowerPC/PowerPC.h"

#ifdef USE_GDBSTUB
#include "PowerPC/GDBStub.h"
#include "Core/PowerPC/GDBStub.h"
#endif

#include "DSPEmulator.h"
#include "ConfigManager.h"
#include "VideoBackendBase.h"
#include "AudioCommon.h"
#include "OnScreenDisplay.h"

#include "VolumeHandler.h"
#include "FileMonitor.h"

#include "MemTools.h"
#include "Host.h"
#include "LogManager.h"
#include "DiscIO/FileMonitor.h"

#include "State.h"
#include "Movie.h"
#include "NetPlayProto.h"
#include "PatchEngine.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoBackendBase.h"

// TODO: ugly, remove
bool g_aspect_wide;
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/Core.h
View file
Expand Up @@ -11,11 +11,11 @@

#pragma once

#include <vector>
#include <string>
#include <vector>

#include "CommonTypes.h"
#include "CoreParameter.h"
#include "Common/CommonTypes.h"
#include "Core/CoreParameter.h"

namespace Core
{
Expand Down
32 changes: 16 additions & 16 deletions Source/Core/Core/CoreParameter.cpp
View file
Expand Up @@ -2,24 +2,24 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "CommonPaths.h"
#include "FileUtil.h"
#include "StringUtil.h"
#include "CDUtils.h"
#include "NANDContentLoader.h"

#include "VolumeCreator.h" // DiscIO

#include "Boot/Boot.h" // Core
#include "Boot/Boot_DOL.h"
#include "CoreParameter.h"
#include "ConfigManager.h"
#include "Core.h" // for bWii
#include "FifoPlayer/FifoDataFile.h"

#include <cinttypes>

#include "Common/CDUtils.h"
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h" // for bWii
#include "Core/CoreParameter.h"
#include "Core/Boot/Boot.h"
#include "Core/Boot/Boot_DOL.h"
#include "Core/FifoPlayer/FifoDataFile.h"

#include "DiscIO/NANDContentLoader.h"
#include "DiscIO/VolumeCreator.h"

SCoreStartupParameter::SCoreStartupParameter()
: hInstance(0),
bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/Core/CoreParameter.h
View file
Expand Up @@ -4,9 +4,10 @@

#pragma once

#include "IniFile.h"
#include <string>

#include "Common/IniFile.h"

enum Hotkey
{
HK_OPEN,
Expand Down
18 changes: 10 additions & 8 deletions Source/Core/Core/CoreTiming.cpp
View file
Expand Up @@ -2,16 +2,18 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <vector>
#include <cinttypes>
#include <vector>

#include "Common/FifoQueue.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"

#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/PowerPC/PowerPC.h"

#include "Thread.h"
#include "PowerPC/PowerPC.h"
#include "CoreTiming.h"
#include "Core.h"
#include "StringUtil.h"
#include "VideoBackendBase.h"
#include "FifoQueue.h"
#include "VideoCommon/VideoBackendBase.h"

#define MAX_SLICE_LENGTH 20000

Expand Down
5 changes: 2 additions & 3 deletions Source/Core/Core/CoreTiming.h
View file
Expand Up @@ -17,11 +17,10 @@
// inside callback:
// ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")

#include "Common.h"

#include <string>

#include "ChunkFile.h"
#include "Common/ChunkFile.h"
#include "Common/Common.h"

namespace CoreTiming
{
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/Core/DSP/DSPAccelerator.cpp
View file
Expand Up @@ -2,13 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "MathUtil.h"
#include "Common/Common.h"
#include "Common/MathUtil.h"

#include "DSPCore.h"
#include "DSPHost.h"
#include "DSPHWInterface.h"
#include "DSPInterpreter.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHost.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPInterpreter.h"

// The hardware adpcm decoder :)
static s16 ADPCM_Step(u32& _rSamplePos)
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/DSP/DSPAnalyzer.cpp
View file
Expand Up @@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "DSPAnalyzer.h"
#include "DSPInterpreter.h"
#include "DSPTables.h"
#include "DSPMemoryMap.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPTables.h"

namespace DSPAnalyzer {

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPAnalyzer.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "DSPInterpreter.h"
#include "Core/DSP/DSPInterpreter.h"

// Basic code analysis.
namespace DSPAnalyzer
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPBreakpoints.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

// super fast breakpoints for a limited range.
// To be used interchangeably with the BreakPoints class.
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/Core/DSP/DSPCodeUtil.cpp
View file
Expand Up @@ -5,13 +5,13 @@
#include <iostream>
#include <vector>

#include "Common.h"
#include "FileUtil.h"
#include "StringUtil.h"
#include "DSPCodeUtil.h"
#include "assemble.h"
#include "disassemble.h"
#include "Common/Common.h"
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"

#include "Core/DSP/assemble.h"
#include "Core/DSP/disassemble.h"
#include "Core/DSP/DSPCodeUtil.h"

bool Assemble(const char *text, std::vector<u16> &code, bool force)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPCodeUtil.h
View file
Expand Up @@ -7,7 +7,7 @@
#include <string>
#include <vector>

#include "Common.h"
#include "Common/Common.h"

bool Assemble(const char *text, std::vector<u16> &code, bool force = false);
bool Disassemble(const std::vector<u16> &code, bool line_numbers, std::string &text);
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/Core/DSP/DSPCommon.h
View file
Expand Up @@ -4,5 +4,6 @@

#pragma once

#include "CommonTypes.h"
#include "Common/CommonTypes.h"

typedef u16 UDSPInstruction;
24 changes: 12 additions & 12 deletions Source/Core/Core/DSP/DSPCore.cpp
View file
Expand Up @@ -23,18 +23,18 @@

====================================================================*/

#include "Common.h"
#include "Hash.h"
#include "Thread.h"
#include "DSPCore.h"
#include "DSPEmitter.h"
#include "DSPHost.h"
#include "DSPAnalyzer.h"
#include "MemoryUtil.h"
#include "FileUtil.h"

#include "DSPHWInterface.h"
#include "DSPIntUtil.h"
#include "Common/Common.h"
#include "Common/FileUtil.h"
#include "Common/Hash.h"
#include "Common/MemoryUtil.h"
#include "Common/Thread.h"

#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPHost.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPIntUtil.h"

SDSP g_dsp;
DSPBreakpoints dsp_breakpoints;
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/DSPCore.h
View file
Expand Up @@ -25,10 +25,10 @@

#pragma once

#include "Thread.h"
#include "Common/Thread.h"

#include "DSPBreakpoints.h"
#include "DSPEmitter.h"
#include "Core/DSP/DSPBreakpoints.h"
#include "Core/DSP/DSPEmitter.h"

#define DSP_IRAM_BYTE_SIZE 0x2000
#define DSP_IRAM_SIZE 0x1000
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/Core/DSP/DSPEmitter.cpp
View file
Expand Up @@ -4,12 +4,12 @@

#include <cstring>

#include "DSPEmitter.h"
#include "DSPMemoryMap.h"
#include "DSPCore.h"
#include "DSPHost.h"
#include "DSPInterpreter.h"
#include "DSPAnalyzer.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPHost.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPMemoryMap.h"

#define MAX_BLOCK_SIZE 250
#define DSP_IDLE_SKIP_CYCLES 0x1000
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/Core/DSP/DSPEmitter.h
View file
Expand Up @@ -6,14 +6,14 @@

#include <list>

#include "DSPCommon.h"
#include "x64ABI.h"
#include "x64Emitter.h"
#include "Jit/DSPJitRegCache.h"
#include "Common/x64ABI.h"
#include "Common/x64Emitter.h"

#define COMPILED_CODE_SIZE 2097152
#include "Core/DSP/DSPCommon.h"
#include "Core/DSP/Jit/DSPJitRegCache.h"

#define MAX_BLOCKS 0x10000
#define COMPILED_CODE_SIZE 2097152
#define MAX_BLOCKS 0x10000

typedef u32 (*DSPCompiledCode)();
typedef const u8 *Block;
Expand Down
24 changes: 12 additions & 12 deletions Source/Core/Core/DSP/DSPHWInterface.cpp
View file
Expand Up @@ -23,18 +23,18 @@

====================================================================*/

#include "Atomic.h"
#include "Thread.h"
#include "MemoryUtil.h"

#include "DSPCore.h"
#include "DSPHost.h"
#include "DSPTables.h"
#include "DSPAnalyzer.h"
#include "DSPAccelerator.h"
#include "DSPInterpreter.h"
#include "DSPHWInterface.h"
#include "CPUDetect.h"
#include "Common/Atomic.h"
#include "Common/CPUDetect.h"
#include "Common/MemoryUtil.h"
#include "Common/Thread.h"

#include "Core/DSP/DSPAccelerator.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHost.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPTables.h"

#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
#include <tmmintrin.h>
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPHWInterface.h
View file
Expand Up @@ -25,7 +25,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

#define GDSP_MBOX_CPU 0
#define GDSP_MBOX_DSP 1
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/DSPIntCCUtil.cpp
View file
Expand Up @@ -7,9 +7,9 @@

// HELPER FUNCTIONS

#include "DSPIntCCUtil.h"
#include "DSPCore.h"
#include "DSPInterpreter.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"

namespace DSPInterpreter {

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPIntCCUtil.h
View file
Expand Up @@ -8,7 +8,7 @@

// Anything to do with SR and conditions goes here.

#include "Common.h"
#include "Common/Common.h"

namespace DSPInterpreter {

Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/DSPIntExtOps.cpp
View file
Expand Up @@ -2,9 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "DSPIntUtil.h"
#include "DSPMemoryMap.h"
#include "DSPIntExtOps.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"

//not needed for game ucodes (it slows down interpreter/dspjit32 + easier to compare int VS dspjit64 without it)
//#define PRECISE_BACKLOG
Expand Down Expand Up @@ -34,7 +34,7 @@ namespace Ext

inline bool IsSameMemArea(u16 a, u16 b)
{
//LM: tested on WII
//LM: tested on WII
if ((a>>10)==(b>>10))
return true;
else
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPIntExtOps.h
View file
Expand Up @@ -25,7 +25,7 @@

#pragma once

#include "DSPTables.h"
#include "Core/DSP/DSPTables.h"

// Extended opcode support.
// Many opcode have the lower 0xFF (some only 0x7f) free - there, an opcode extension
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Core/DSP/DSPIntUtil.h
View file
Expand Up @@ -25,12 +25,12 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

#include "DSPInterpreter.h"
#include "DSPCore.h"
#include "DSPMemoryMap.h"
#include "DSPStacks.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPStacks.h"


// ---------------------------------------------------------------------------------------
Expand Down
11 changes: 5 additions & 6 deletions Source/Core/Core/DSP/DSPInterpreter.cpp
View file
Expand Up @@ -23,12 +23,11 @@

====================================================================*/

#include "DSPTables.h"
#include "DSPCore.h"
#include "DSPAnalyzer.h"

#include "DSPHWInterface.h"
#include "DSPIntUtil.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPTables.h"

namespace DSPInterpreter {

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPInterpreter.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "DSPTables.h"
#include "Core/DSP/DSPTables.h"

#define DSP_REG_MASK 0x1f

Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/DSP/DSPMemoryMap.cpp
View file
Expand Up @@ -23,10 +23,10 @@

====================================================================*/

#include "DSPInterpreter.h"
#include "DSPMemoryMap.h"
#include "DSPHWInterface.h"
#include "DSPCore.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPMemoryMap.h"

u16 dsp_imem_read(u16 addr)
{
Expand Down
7 changes: 4 additions & 3 deletions Source/Core/Core/DSP/DSPMemoryMap.h
View file
Expand Up @@ -25,9 +25,10 @@

#pragma once

#include "Common.h"
#include "DSPInterpreter.h"
#include "DSPCore.h"
#include "Common/Common.h"

#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPInterpreter.h"

u16 dsp_imem_read(u16 addr);
void dsp_dmem_write(u16 addr, u16 val);
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/DSPStacks.cpp
View file
Expand Up @@ -23,10 +23,10 @@

====================================================================*/

#include "Common.h"
#include "Common/Common.h"

#include "DSPCore.h"
#include "DSPStacks.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPStacks.h"

// Stacks. The stacks are outside the DSP RAM, in dedicated hardware.

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/DSPStacks.h
View file
Expand Up @@ -25,7 +25,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

void dsp_reg_store_stack(int stack_reg, u16 val);
u16 dsp_reg_load_stack(int stack_reg);
10 changes: 5 additions & 5 deletions Source/Core/Core/DSP/DSPTables.cpp
View file
Expand Up @@ -4,12 +4,12 @@

// Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)

#include "Common.h"
#include "DSPTables.h"
#include "Common/Common.h"

#include "DSPInterpreter.h"
#include "DSPIntExtOps.h"
#include "DSPEmitter.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntExtOps.h"
#include "Core/DSP/DSPTables.h"

void nop(const UDSPInstruction opc)
{
Expand Down
5 changes: 2 additions & 3 deletions Source/Core/Core/DSP/DSPTables.h
View file
Expand Up @@ -6,9 +6,8 @@

#pragma once

//nclude "Common.h"
#include "DSPEmitter.h"
#include "DSPCommon.h"
#include "Core/DSP/DSPCommon.h"
#include "Core/DSP/DSPEmitter.h"

// The non-ADDR ones that end with _D are the opposite one - if the bit specify
// ACC0, then ACC_D will be ACC1.
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/DspIntArithmetic.cpp
View file
Expand Up @@ -4,9 +4,9 @@
//
// Additional copyrights go to Duddie and Tratax (c) 2004

#include "DSPInterpreter.h"
#include "DSPIntCCUtil.h"
#include "DSPIntUtil.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"

// Arithmetic and accumulator control.

Expand Down
13 changes: 6 additions & 7 deletions Source/Core/Core/DSP/DspIntBranch.cpp
View file
Expand Up @@ -4,13 +4,12 @@
//
// Additional copyrights go to Duddie and Tratax (c) 2004

#include "DSPInterpreter.h"
#include "DSPCore.h"
#include "DSPMemoryMap.h"
#include "DSPStacks.h"

#include "DSPIntCCUtil.h"
#include "DSPIntUtil.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPStacks.h"

namespace DSPInterpreter {

Expand Down
7 changes: 3 additions & 4 deletions Source/Core/Core/DSP/DspIntLoadStore.cpp
View file
Expand Up @@ -4,10 +4,9 @@
//
// Additional copyrights go to Duddie and Tratax (c) 2004

#include "DSPInterpreter.h"

#include "DSPMemoryMap.h"
#include "DSPIntUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"

namespace DSPInterpreter {

Expand Down
7 changes: 3 additions & 4 deletions Source/Core/Core/DSP/DspIntMisc.cpp
View file
Expand Up @@ -4,11 +4,10 @@
//
// Additional copyrights go to Duddie and Tratax (c) 2004

#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPInterpreter.h"

#include "DSPInterpreter.h"

#include "DSPCore.h"
#include "DSPIntUtil.h"
#include "Core/DSP/DSPIntUtil.h"

namespace DSPInterpreter {

Expand Down
7 changes: 3 additions & 4 deletions Source/Core/Core/DSP/DspIntMultiplier.cpp
View file
Expand Up @@ -7,10 +7,9 @@

// Multiplier and product register control

#include "DSPInterpreter.h"

#include "DSPIntCCUtil.h"
#include "DSPIntUtil.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"

namespace DSPInterpreter {

Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp
View file
Expand Up @@ -4,10 +4,10 @@

// Additional copyrights go to Duddie and Tratax (c) 2004

#include "../DSPAnalyzer.h"
#include "../DSPEmitter.h"
#include "../DSPIntCCUtil.h"
#include "../DSPIntUtil.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPIntUtil.h"

using namespace Gen;

Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/DSP/Jit/DSPJitBranch.cpp
View file
Expand Up @@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "../DSPAnalyzer.h"
#include "../DSPEmitter.h"
#include "../DSPMemoryMap.h"
#include "../DSPStacks.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPStacks.h"

using namespace Gen;

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp
View file
Expand Up @@ -4,8 +4,8 @@

// Additional copyrights go to Duddie and Tratax (c) 2004

#include "../DSPEmitter.h"
#include "../DSPIntUtil.h" // Helper functions
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPIntUtil.h" // Helper functions

using namespace Gen;

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp
View file
Expand Up @@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "../DSPEmitter.h"
#include "../DSPMemoryMap.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPMemoryMap.h"

using namespace Gen;

Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp
View file
Expand Up @@ -4,9 +4,9 @@

// Additional copyrights go to Duddie and Tratax (c) 2004

#include "../DSPEmitter.h"
#include "../DSPIntCCUtil.h"
#include "../DSPIntUtil.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPIntUtil.h"

using namespace Gen;

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/DSP/Jit/DSPJitMisc.cpp
View file
Expand Up @@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "../DSPEmitter.h"
#include "../DSPIntUtil.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPIntUtil.h"

using namespace Gen;

Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp
View file
Expand Up @@ -7,9 +7,9 @@

// Multiplier and product register control

#include "../DSPAnalyzer.h"
#include "../DSPEmitter.h"
#include "../DSPIntUtil.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPIntUtil.h"

using namespace Gen;

Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
View file
Expand Up @@ -2,9 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "DSPJitRegCache.h"
#include "../DSPEmitter.h"
#include "../DSPMemoryMap.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/Jit/DSPJitRegCache.h"

using namespace Gen;

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/Jit/DSPJitRegCache.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "x64Emitter.h"
#include "Common/x64Emitter.h"

class DSPEmitter;

Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/DSP/Jit/DSPJitUtil.cpp
View file
Expand Up @@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "DSPJitUtil.h"
#include "../DSPEmitter.h"
#include "../DSPHWInterface.h"
#include "../DSPMemoryMap.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/Jit/DSPJitUtil.h"

using namespace Gen;

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/DSP/LabelMap.cpp
View file
Expand Up @@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "LabelMap.h"
#include "DSPTables.h"
#include "Core/DSP/DSPTables.h"
#include "Core/DSP/LabelMap.h"

LabelMap::LabelMap()
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/DSP/LabelMap.h
View file
Expand Up @@ -7,7 +7,7 @@
#include <string>
#include <vector>

#include "Common.h"
#include "Common/Common.h"

enum LabelType
{
Expand Down
18 changes: 9 additions & 9 deletions Source/Core/Core/DSP/assemble.cpp
View file
Expand Up @@ -39,17 +39,17 @@ Initial import

#include <cstdio>
#include <cstdlib>

#include <map>
#include <iostream>
#include <fstream>
#include <iostream>
#include <map>

#include "Common/Common.h"
#include "Common/FileUtil.h"

#include "Common.h"
#include "FileUtil.h"
#include "DSPInterpreter.h"
#include "DSPTables.h"
#include "disassemble.h"
#include "assemble.h"
#include "Core/DSP/assemble.h"
#include "Core/DSP/disassemble.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPTables.h"

static const char *err_string[] =
{
Expand Down
11 changes: 6 additions & 5 deletions Source/Core/Core/DSP/assemble.h
View file
Expand Up @@ -24,13 +24,14 @@

#pragma once

#include <string>
#include <map>
#include <string>

#include "Common/Common.h"

#include "Common.h"
#include "disassemble.h"
#include "DSPTables.h"
#include "LabelMap.h"
#include "Core/DSP/disassemble.h"
#include "Core/DSP/DSPTables.h"
#include "Core/DSP/LabelMap.h"

enum err_t
{
Expand Down
13 changes: 7 additions & 6 deletions Source/Core/Core/DSP/disassemble.cpp
View file
Expand Up @@ -23,13 +23,14 @@

====================================================================*/

#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>

#include "Common.h"
#include "FileUtil.h"
#include "disassemble.h"
#include "DSPTables.h"
#include "Common/Common.h"
#include "Common/FileUtil.h"

#include "Core/DSP/disassemble.h"
#include "Core/DSP/DSPTables.h"

#ifdef _MSC_VER
#pragma warning(disable:4996)
Expand Down
7 changes: 4 additions & 3 deletions Source/Core/Core/DSP/disassemble.h
View file
Expand Up @@ -27,9 +27,10 @@
#include <map>
#include <vector>

#include "Common.h"
#include "DSPTables.h"
#include "LabelMap.h"
#include "Common/Common.h"

#include "Core/DSP/DSPTables.h"
#include "Core/DSP/LabelMap.h"

struct AssemblerSettings
{
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/DSPEmulator.cpp
View file
Expand Up @@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "DSPEmulator.h"
#include "Core/DSPEmulator.h"

#include "HW/DSPLLE/DSPLLE.h"
#include "HW/DSPHLE/DSPHLE.h"
#include "Core/HW/DSPHLE/DSPHLE.h"
#include "Core/HW/DSPLLE/DSPLLE.h"

DSPEmulator *CreateDSPEmulator(bool HLE)
{
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/DSPEmulator.h
View file
Expand Up @@ -4,8 +4,8 @@

#pragma once

#include "ChunkFile.h"
#include "SoundStream.h"
#include "AudioCommon/SoundStream.h"
#include "Common/ChunkFile.h"

class DSPEmulator
{
Expand Down
17 changes: 9 additions & 8 deletions Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
View file
Expand Up @@ -2,14 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "StringUtil.h"
#include "Debugger_SymbolMap.h"
#include "../Core.h"
#include "../HW/Memmap.h"
#include "../PowerPC/PowerPC.h"
#include "../PowerPC/PPCAnalyst.h"
#include "../PowerPC/PPCSymbolDB.h"
#include "Common/Common.h"
#include "Common/StringUtil.h"

#include "Core/Core.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCSymbolDB.h"

namespace Dolphin_Debugger
{
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/Debugger/Debugger_SymbolMap.h
View file
Expand Up @@ -4,10 +4,10 @@

#pragma once

#include <vector>
#include <string>
#include <vector>

#include "Common.h"
#include "Common/Common.h"

namespace Dolphin_Debugger
{
Expand Down
9 changes: 5 additions & 4 deletions Source/Core/Core/Debugger/Dump.cpp
View file
Expand Up @@ -2,11 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include <stdio.h>
#include <cstdio>

#include "Common.h"
#include "Dump.h"
#include "FileUtil.h"
#include "Common/Common.h"
#include "Common/FileUtil.h"

#include "Core/Debugger/Dump.h"

CDump::CDump(const char* _szFilename) :
m_pData(NULL)
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Debugger/Dump.h
View file
Expand Up @@ -8,7 +8,7 @@
//
#pragma once

#include "Common.h"
#include "Common/Common.h"

class CDump
{
Expand Down
22 changes: 11 additions & 11 deletions Source/Core/Core/Debugger/PPCDebugInterface.cpp
View file
Expand Up @@ -2,18 +2,18 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Debugger_SymbolMap.h"
#include "DebugInterface.h"
#include "PPCDebugInterface.h"
#include "PowerPCDisasm.h"
#include "../Host.h"
#include "../Core.h"
#include "../HW/CPU.h"
#include "../HW/DSP.h"
#include "../HW/Memmap.h"
#include "../PowerPC/PowerPC.h"
#include "../PowerPC/JitCommon/JitBase.h"
#include "../PowerPC/PPCSymbolDB.h"

#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/JitCommon/JitBase.h"

void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Debugger/PPCDebugInterface.h
View file
Expand Up @@ -6,7 +6,7 @@

#include <string>

#include "DebugInterface.h"
#include "Common/DebugInterface.h"

//wrapper between disasm control and Dolphin debugger

Expand Down
13 changes: 6 additions & 7 deletions Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
View file
Expand Up @@ -2,14 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "FifoAnalyzer.h"
#include "Core/Core.h"
#include "Core/FifoPlayer/FifoAnalyzer.h"

#include "Core.h"

#include "VertexLoader.h"
#include "VertexLoader_Position.h"
#include "VertexLoader_Normal.h"
#include "VertexLoader_TextCoord.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoader_Normal.h"
#include "VideoCommon/VertexLoader_Position.h"
#include "VideoCommon/VertexLoader_TextCoord.h"

namespace FifoAnalyzer
{
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/FifoPlayer/FifoAnalyzer.h
View file
Expand Up @@ -4,10 +4,10 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

#include "BPMemory.h"
#include "CPMemory.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/CPMemory.h"

namespace FifoAnalyzer
{
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/FifoPlayer/FifoDataFile.cpp
View file
Expand Up @@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "FifoDataFile.h"
#include "FifoFileStruct.h"
#include "Common/FileUtil.h"

#include "FileUtil.h"
#include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/FifoPlayer/FifoFileStruct.h"

using namespace FifoFileStruct;
using namespace std;
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/Core/FifoPlayer/FifoDataFile.h
View file
Expand Up @@ -4,9 +4,10 @@

#pragma once

#include "Common.h"
#include <vector>

#include "Common/Common.h"

namespace File
{
class IOFile;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/FifoPlayer/FifoFileStruct.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

namespace FifoFileStruct
{
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp
View file
Expand Up @@ -2,15 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "FifoAnalyzer.h"
#include "FifoDataFile.h"
#include "FifoPlaybackAnalyzer.h"
#include "Common/Common.h"

#include "Common.h"
#include "Core/FifoPlayer/FifoAnalyzer.h"
#include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"

#include "OpcodeDecoding.h"
#include "TextureDecoder.h"
#include "VertexLoader.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/TextureDecoder.h"
#include "VideoCommon/VertexLoader.h"

using namespace std;
using namespace FifoAnalyzer;
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h
View file
Expand Up @@ -4,12 +4,12 @@

#pragma once

#include "FifoAnalyzer.h"
#include "FifoDataFile.h"

#include <string>
#include <vector>

#include "Core/FifoPlayer/FifoAnalyzer.h"
#include "Core/FifoPlayer/FifoDataFile.h"

struct AnalyzedFrameInfo
{
std::vector<u32> objectStarts;
Expand Down
29 changes: 14 additions & 15 deletions Source/Core/Core/FifoPlayer/FifoPlayer.cpp
View file
Expand Up @@ -2,21 +2,20 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "FifoDataFile.h"
#include "FifoPlayer.h"

#include "Common.h"
#include "ConfigManager.h"
#include "Core.h"
#include "CoreTiming.h"
#include "Host.h"

#include "HW/GPFifo.h"
#include "HW/Memmap.h"
#include "HW/SystemTimers.h"
#include "PowerPC/PowerPC.h"

#include "BPMemory.h"
#include "Common/Common.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/Host.h"
#include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/FifoPlayer/FifoPlayer.h"
#include "Core/HW/GPFifo.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h"
#include "Core/PowerPC/PowerPC.h"

#include "VideoCommon/BPMemory.h"

FifoPlayer::~FifoPlayer()
{
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/Core/FifoPlayer/FifoPlayer.h
View file
Expand Up @@ -4,10 +4,11 @@

#pragma once

#include "FifoPlaybackAnalyzer.h"
#include <string>
#include <vector>

#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"

class FifoDataFile;
struct MemoryUpdate;
struct AnalyzedFrameInfo;
Expand Down
17 changes: 8 additions & 9 deletions Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp
View file
Expand Up @@ -2,15 +2,14 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "FifoAnalyzer.h"
#include "FifoRecordAnalyzer.h"
#include "FifoRecorder.h"

#include "Core.h"
#include "HW/Memmap.h"

#include "OpcodeDecoding.h"
#include "TextureDecoder.h"
#include "Core/Core.h"
#include "Core/FifoPlayer/FifoAnalyzer.h"
#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
#include "Core/FifoPlayer/FifoRecorder.h"
#include "Core/HW/Memmap.h"

#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/TextureDecoder.h"

using namespace FifoAnalyzer;

Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h
View file
Expand Up @@ -4,11 +4,11 @@

#pragma once

#include "FifoAnalyzer.h"
#include "Common/Common.h"

#include "Common.h"
#include "Core/FifoPlayer/FifoAnalyzer.h"

#include "BPMemory.h"
#include "VideoCommon/BPMemory.h"

class FifoRecordAnalyzer
{
Expand Down
11 changes: 6 additions & 5 deletions Source/Core/Core/FifoPlayer/FifoRecorder.cpp
View file
Expand Up @@ -2,11 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "ConfigManager.h"
#include "Core.h"
#include "FifoRecorder.h"
#include "Thread.h"
#include "HW/Memmap.h"
#include "Common/Thread.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/FifoPlayer/FifoRecorder.h"
#include "Core/HW/Memmap.h"

static FifoRecorder instance;
static std::recursive_mutex sMutex;
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/FifoPlayer/FifoRecorder.h
View file
Expand Up @@ -4,8 +4,8 @@

#pragma once

#include "FifoDataFile.h"
#include "FifoRecordAnalyzer.h"
#include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/FifoPlayer/FifoRecordAnalyzer.h"

class FifoRecorder
{
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/Core/GeckoCode.cpp
View file
Expand Up @@ -2,15 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "GeckoCode.h"
#include <vector>

#include "Thread.h"
#include "HW/Memmap.h"
#include "ConfigManager.h"
#include "PowerPC/PowerPC.h"
#include "CommonPaths.h"
#include "Common/CommonPaths.h"
#include "Common/Thread.h"

#include <vector>
#include "Core/ConfigManager.h"
#include "Core/GeckoCode.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"

namespace Gecko
{
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/GeckoCode.h
View file
Expand Up @@ -4,11 +4,11 @@

#pragma once

#include "Common.h"

#include <vector>
#include <string>
#include <map>
#include <string>
#include <vector>

#include "Common/Common.h"

namespace Gecko
{
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Core/GeckoCodeConfig.cpp
View file
Expand Up @@ -2,13 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "GeckoCodeConfig.h"
#include <sstream>
#include <string>
#include <vector>

#include "StringUtil.h"
#include "Common/StringUtil.h"

#include <vector>
#include <string>
#include <sstream>
#include "Core/GeckoCodeConfig.h"

namespace Gecko
{
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/GeckoCodeConfig.h
View file
Expand Up @@ -4,9 +4,9 @@

#pragma once

#include "GeckoCode.h"
#include "Common/IniFile.h"

#include "IniFile.h"
#include "Core/GeckoCode.h"

namespace Gecko
{
Expand Down
25 changes: 12 additions & 13 deletions Source/Core/Core/HLE/HLE.cpp
View file
Expand Up @@ -2,20 +2,19 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "Common.h"
#include "Common/Common.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/HLE_Misc.h"
#include "Core/HLE/HLE_OS.h"
#include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCSymbolDB.h"

#include "HLE.h"

#include "../PowerPC/PowerPC.h"
#include "../PowerPC/PPCSymbolDB.h"
#include "../HW/Memmap.h"
#include "../Debugger/Debugger_SymbolMap.h"

#include "HLE_OS.h"
#include "HLE_Misc.h"
#include "IPC_HLE/WII_IPC_HLE_Device_es.h"
#include "ConfigManager.h"
#include "Core.h"

namespace HLE
{
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/Core/HLE/HLE.h
View file
Expand Up @@ -5,7 +5,8 @@
#pragma once

#include <map>
#include "CommonTypes.h"

#include "Common/CommonTypes.h"

namespace HLE
{
Expand Down
41 changes: 22 additions & 19 deletions Source/Core/Core/HLE/HLE_Misc.cpp
View file
Expand Up @@ -3,25 +3,28 @@
// Refer to the license.txt file included.

#include <cmath>
#include "Common.h"
#include "HLE_OS.h"

#include "../PowerPC/PowerPC.h"
#include "../HW/Memmap.h"
#include "../Host.h"
#include "IPC_HLE/WII_IPC_HLE_Device_DI.h"
#include "ConfigManager.h"
#include "VolumeCreator.h"
#include "Filesystem.h"
#include "../Boot/Boot_DOL.h"
#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "HLE.h"
#include "PowerPC/PPCAnalyst.h"
#include "PowerPC/PPCCache.h"
#include "PowerPC/SignatureDB.h"
#include "PowerPC/PPCSymbolDB.h"
#include "CommonPaths.h"
#include "TextureCacheBase.h"

#include "Common/Common.h"
#include "Common/CommonPaths.h"

#include "Core/ConfigManager.h"
#include "Core/Host.h"
#include "Core/Boot/Boot_DOL.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/HLE_OS.h"
#include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCCache.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/SignatureDB.h"

#include "DiscIO/Filesystem.h"
#include "DiscIO/VolumeCreator.h"

#include "VideoCommon/TextureCacheBase.h"

namespace HLE_Misc
{
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Core/HLE/HLE_OS.cpp
View file
Expand Up @@ -2,14 +2,14 @@
// Licensed under GPLv2
// Refer to the license.txt file included.

#include "StringUtil.h"
#include <string>

#include "Common.h"
#include "HLE_OS.h"
#include "Common/Common.h"
#include "Common/StringUtil.h"

#include "../PowerPC/PowerPC.h"
#include "../HW/Memmap.h"
#include "Core/HLE/HLE_OS.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"

namespace HLE_OS
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/HLE/HLE_OS.h
View file
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "Common.h"
#include "Common/Common.h"

namespace HLE_OS
{
Expand Down