From 731669ecc1eb876e42104a8a4ba49ac00572c020 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Thu, 24 Apr 2008 21:49:15 +0000 Subject: [PATCH] Fixed segfaults in DSP & GPU caused by freeing static memory. Ouch\! --- Makefile | 2 +- src/dsp.cpp | 6 +++--- src/gpu.cpp | 6 +++--- vj.cfg | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index eeb8989..f9484cd 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ TARGET = vj # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2 CFLAGS = -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl-config --cflags` CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \ - -ffast-math -fomit-frame-pointer `sdl-config --cflags` + -ffast-math -fomit-frame-pointer `sdl-config --cflags` -g # -fomit-frame-pointer `sdl-config --cflags` -g # -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES diff --git a/src/dsp.cpp b/src/dsp.cpp index 812d103..f77edec 100644 --- a/src/dsp.cpp +++ b/src/dsp.cpp @@ -1355,9 +1355,9 @@ void DSPDone(void) WriteLog("\t%s %i\n", dsp_opcode_str[i], dsp_opcode_use[i]); }//*/ - memory_free(dsp_ram_8); - memory_free(dsp_reg_bank_0); - memory_free(dsp_reg_bank_1); +// memory_free(dsp_ram_8); +// memory_free(dsp_reg_bank_0); +// memory_free(dsp_reg_bank_1); } diff --git a/src/gpu.cpp b/src/gpu.cpp index 10d337b..4610171 100644 --- a/src/gpu.cpp +++ b/src/gpu.cpp @@ -1095,9 +1095,9 @@ void gpu_done(void) } WriteLog("\n"); - memory_free(gpu_ram_8); - memory_free(gpu_reg_bank_0); - memory_free(gpu_reg_bank_1); +// memory_free(gpu_ram_8); +// memory_free(gpu_reg_bank_0); +// memory_free(gpu_reg_bank_1); } // diff --git a/vj.cfg b/vj.cfg index c8ef098..045ccf4 100644 --- a/vj.cfg +++ b/vj.cfg @@ -11,7 +11,7 @@ useJaguarBIOS = 0 JagBootROM = ./bios/jagboot.rom CDBootROM = ./bios/jagcd.rom EEPROMs = ./eeproms -ROMs = ./ROMs +ROMs = ./roms # OpenGL options: 1 - use OpenGL rendering, 0 - use old style rendering -- 2.37.2