Fixed segfaults in DSP & GPU caused by freeing static memory. Ouch\!

diff --git a/Makefile b/Makefile
index eeb8989ed0aa6eb3c78767f84a69312bf43fa258..f9484cdf13c1b0c67369f31c76351161c6ad89c8 100644 (file)
--- 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 812d1035b31297cb9c1c636f3adf8bbfa4f4f4be..f77edec9896ab0c3f3defcbe61b976852c2f1fd6 100644 (file)
--- 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 10d337b45e1eb0abbf822a3bdd834d2a9c345bb7..461017132812d5612a08c847ec314d5183314b22 100644 (file)
--- 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 c8ef0988968c305a8b262d74bae05fe5427db9d2..045ccf43f0532f95696b776ea096b6403391f415 100644 (file)
--- 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