pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only enable profiler when DEBUG is set

Browse source
This commit is contained in:
Dimitris Panokostas 2017-04-19 01:31:57 +02:00
parent 134c7bdc3a
commit 78ed4b85e4
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -40,14 +40,14 @@ MORE_CFLAGS += -Wno-unused -Wno-format -DGCCCONSTFUNC="__attribute__((const))"
MORE_CFLAGS += -fexceptions -fpermissive MORE_CFLAGS += -fexceptions -fpermissive
MORE_CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free MORE_CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
LDFLAGS += -lpthread -lm -lz -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl -lprofiler -ltcmalloc LDFLAGS += -lpthread -lm -lz -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl -ltcmalloc
LDFLAGS += -lSDL2 -lSDL2_image -lSDL2_ttf -lguisan -L/opt/vc/lib -Lsrc/guisan/lib LDFLAGS += -lSDL2 -lSDL2_image -lSDL2_ttf -lguisan -L/opt/vc/lib -Lsrc/guisan/lib
ifndef DEBUG ifndef DEBUG
MORE_CFLAGS += -Ofast -pipe -Wno-write-strings MORE_CFLAGS += -Ofast -pipe -Wno-write-strings
else else
MORE_CFLAGS += -g -DDEBUG -Wl,--export-dynamic MORE_CFLAGS += -g -DDEBUG -Wl,--export-dynamic
LDFLAGS += -lprofiler
endif endif
ASFLAGS += $(CPU_FLAGS) ASFLAGS += $(CPU_FLAGS)

1
VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
View file

@ -69,6 +69,7 @@
<ProjectFile>Amiberry.vcxproj</ProjectFile> <ProjectFile>Amiberry.vcxproj</ProjectFile>
<RemoteBuildEnvironment> <RemoteBuildEnvironment>
<Records /> <Records />
<EnvironmentSetupFiles />
</RemoteBuildEnvironment> </RemoteBuildEnvironment>
<ParallelJobCount>1</ParallelJobCount> <ParallelJobCount>1</ParallelJobCount>
</Build> </Build>

6
VisualGDB/Amiberry/Amiberry.vcxproj
View file

@ -71,7 +71,7 @@
<Link> <Link>
<AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs> <AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories> <LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;profiler;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames> <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript /> <LinkerScript />
<ExtraRPATH> <ExtraRPATH>
</ExtraRPATH> </ExtraRPATH>
@ -89,7 +89,7 @@
<Link> <Link>
<AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs> <AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories> <LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;profiler;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames> <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript> <LinkerScript>
</LinkerScript> </LinkerScript>
<ExtraRPATH> <ExtraRPATH>
@ -108,7 +108,7 @@
<Link> <Link>
<AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs> <AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
<LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories> <LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
<AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;profiler;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames> <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
<LinkerScript> <LinkerScript>
</LinkerScript> </LinkerScript>
<ExtraRPATH> <ExtraRPATH>

4
src/newcpu.cpp
View file

@ -50,7 +50,11 @@
#include "cia.h" #include "cia.h"
#include "inputdevice.h" #include "inputdevice.h"
#include "audio.h" #include "audio.h"
#ifdef DEBUG
#include <gperftools/profiler.h> #include <gperftools/profiler.h>
#endif
#ifdef JIT #ifdef JIT
#include "jit/compemu.h" #include "jit/compemu.h"
#include <signal.h> #include <signal.h>

7
src/osdep/amiberry.cpp
View file

@ -508,8 +508,7 @@ void ReadDirectory(const char* path, vector<string>* dirs, vector<string>* files
if (files != nullptr) if (files != nullptr)
files->clear(); files->clear();
dir = opendir(path); if ((dir = opendir(path)) != nullptr)
if (dir != nullptr)
{ {
while ((dent = readdir(dir)) != nullptr) while ((dent = readdir(dir)) != nullptr)
{ {
@ -527,9 +526,9 @@ void ReadDirectory(const char* path, vector<string>* dirs, vector<string>* files
} }
if (dirs != nullptr) if (dirs != nullptr)
std::sort(dirs->begin(), dirs->end()); sort(dirs->begin(), dirs->end());
if (files != nullptr) if (files != nullptr)
std::sort(files->begin(), files->end()); sort(files->begin(), files->end());
} }
void saveAdfDir() void saveAdfDir()