aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2019-07-29 05:44:53 +0200
committerGitHub2019-07-29 05:44:53 +0200
commit2601ff11e452d0d5f8a0e52e6179ef4fb28e95e7 (patch)
tree28a54fb950fac94558f58ce8f193d79b1ab0b0cf
parent77d120bc1afa4386a4e602df6712a0850630bc1c (diff)
parent833174ecc4ca153acb4bf7417836af2e6cc2de49 (diff)
downloadpcsx_rearmed-2601ff11e452d0d5f8a0e52e6179ef4fb28e95e7.tar.gz
pcsx_rearmed-2601ff11e452d0d5f8a0e52e6179ef4fb28e95e7.tar.bz2
pcsx_rearmed-2601ff11e452d0d5f8a0e52e6179ef4fb28e95e7.zip
Merge pull request #317 from retro-wertz/psxhle_log
psxhle.c: Silence logging when using HLE bios
-rw-r--r--Makefile2
-rw-r--r--libpcsxcore/psxhle.c12
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1f491f3..a278519 100644
--- a/Makefile
+++ b/Makefile
@@ -337,13 +337,11 @@ frontend/revision.h: FORCE
target_: $(TARGET)
$(TARGET): $(OBJS)
- @echo "** BUILDING $(TARGET) FOR PLATFORM $(PLATFORM) **"
ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJS)
else
$(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS)
endif
- @echo "** BUILD SUCCESSFUL! GG NO RE **"
clean: $(PLAT_CLEAN) clean_plugins
$(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h
diff --git a/libpcsxcore/psxhle.c b/libpcsxcore/psxhle.c
index 83362ec..7507192 100644
--- a/libpcsxcore/psxhle.c
+++ b/libpcsxcore/psxhle.c
@@ -23,6 +23,12 @@
#include "psxhle.h"
+#if 0
+#define PSXHLE_LOG SysPrintf
+#else
+#define PSXHLE_LOG(...)
+#endif
+
static void hleDummy() {
psxRegs.pc = psxRegs.GPR.n.ra;
@@ -54,10 +60,10 @@ static void hleC0() {
}
static void hleBootstrap() { // 0xbfc00000
- SysPrintf("hleBootstrap\n");
+ PSXHLE_LOG("hleBootstrap\n");
CheckCdrom();
LoadCdrom();
- SysPrintf("CdromLabel: \"%s\": PC = %8.8lx (SP = %8.8lx)\n", CdromLabel, psxRegs.pc, psxRegs.GPR.n.sp);
+ PSXHLE_LOG("CdromLabel: \"%s\": PC = %8.8lx (SP = %8.8lx)\n", CdromLabel, psxRegs.pc, psxRegs.GPR.n.sp);
}
typedef struct {
@@ -77,7 +83,7 @@ typedef struct {
static void hleExecRet() {
EXEC *header = (EXEC*)PSXM(psxRegs.GPR.n.s0);
- SysPrintf("ExecRet %x: %x\n", psxRegs.GPR.n.s0, header->ret);
+ PSXHLE_LOG("ExecRet %x: %x\n", psxRegs.GPR.n.s0, header->ret);
psxRegs.GPR.n.ra = header->ret;
psxRegs.GPR.n.sp = header->_sp;