From 7e79806efcd5c5e41efea89fa385b480ac1882f5 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 8 Jul 2014 22:37:58 +0200 Subject: remove unused globals Also change globals into statics which are only used in one file --- Source/Core/Common/ArmEmitter.cpp | 4 ++-- Source/Core/Common/ArmEmitter.h | 3 --- Source/Core/Common/ExtendedTrace.cpp | 4 ++-- Source/Core/Common/ExtendedTrace.h | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) (limited to 'Source/Core/Common') diff --git a/Source/Core/Common/ArmEmitter.cpp b/Source/Core/Common/ArmEmitter.cpp index aeaba58997..c5b2224d3a 100644 --- a/Source/Core/Common/ArmEmitter.cpp +++ b/Source/Core/Common/ArmEmitter.cpp @@ -916,7 +916,7 @@ u32 EncodeVm(ARMReg Vm) } // Double/single, Neon -const VFPEnc VFPOps[16][2] = { +static const VFPEnc VFPOps[16][2] = { {{0xE0, 0xA0}, { -1, -1}}, // 0: VMLA {{0xE1, 0xA4}, { -1, -1}}, // 1: VNMLA {{0xE0, 0xA4}, { -1, -1}}, // 2: VMLS @@ -934,7 +934,7 @@ const VFPEnc VFPOps[16][2] = { {{ -1, -1}, {0x3B, 0x30}}, // 14: VABSi }; -const char *VFPOpNames[16] = { +static const char *VFPOpNames[16] = { "VMLA", "VNMLA", "VMLS", diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h index c4820b6a9c..d33269d090 100644 --- a/Source/Core/Common/ArmEmitter.h +++ b/Source/Core/Common/ArmEmitter.h @@ -720,7 +720,4 @@ struct VFPEnc { s16 opc1; s16 opc2; }; -extern const VFPEnc VFPOps[16][2]; -extern const char *VFPOpNames[16]; - } // namespace diff --git a/Source/Core/Common/ExtendedTrace.cpp b/Source/Core/Common/ExtendedTrace.cpp index 2262b6afba..54594eb4a9 100644 --- a/Source/Core/Common/ExtendedTrace.cpp +++ b/Source/Core/Common/ExtendedTrace.cpp @@ -411,8 +411,8 @@ void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip, if (hThread != GetCurrentThread()) ResumeThread(hThread); } - -char g_uefbuf[2048]; +#define UEFBUFSIZE 2048 +static char g_uefbuf[UEFBUFSIZE]; void etfprintf(FILE *file, const char *format, ...) { diff --git a/Source/Core/Common/ExtendedTrace.h b/Source/Core/Common/ExtendedTrace.h index e0efd85200..ea4ab867e6 100644 --- a/Source/Core/Common/ExtendedTrace.h +++ b/Source/Core/Common/ExtendedTrace.h @@ -36,8 +36,6 @@ void StackTrace(HANDLE, char const* msg, FILE *file, DWORD eip, DWORD esp, DWORD // functions by Masken void etfprintf(FILE *file, const char *format, ...); void etfprint(FILE *file, const std::string &text); -#define UEFBUFSIZE 2048 -extern char g_uefbuf[UEFBUFSIZE]; #else // not WIN32 -- cgit v1.2.3