Miscellaneous fixes, plus extra whitespace munging for good effect.

[virtualjaguar] / src / jaguar.cpp

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index cfbf3ef134ae8861070b4fc0f88895407108b331..ac8a4308e72dc9f22183cf3606e79da7d0dd6396 100644 (file)
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -182,7 +182,7 @@ if (inRoutine)
 
        if (m68kPC & 0x01)              // Oops! We're fetching an odd address!
        {
-               WriteLog("M68K: Attempted to execute from an odd adress!\n\nBacktrace:\n\n");
+               WriteLog("M68K: Attempted to execute from an odd address!\n\nBacktrace:\n\n");
 
                static char buffer[2048];
                for(int i=0; i<0x400; i++)
@@ -1026,7 +1026,7 @@ unsigned int m68k_read_memory_8(unsigned int address)
 #ifdef ALPINE_FUNCTIONS
        // Check if breakpoint on memory is active, and deal with it
        if (bpmActive && address == bpmAddress1)
-               M68KSetHalt();
+               M68KDebugHalt();
 #endif
 
        // Musashi does this automagically for you, UAE core does not :-P
@@ -1085,7 +1085,7 @@ unsigned int m68k_read_memory_16(unsigned int address)
 #ifdef ALPINE_FUNCTIONS
        // Check if breakpoint on memory is active, and deal with it
        if (bpmActive && address == bpmAddress1)
-               M68KSetHalt();
+               M68KDebugHalt();
 #endif
 
        // Musashi does this automagically for you, UAE core does not :-P
@@ -1193,7 +1193,7 @@ unsigned int m68k_read_memory_32(unsigned int address)
 #ifdef ALPINE_FUNCTIONS
        // Check if breakpoint on memory is active, and deal with it
        if (bpmActive && address == bpmAddress1)
-               M68KSetHalt();
+               M68KDebugHalt();
 #endif
 
        // Musashi does this automagically for you, UAE core does not :-P
@@ -1216,7 +1216,7 @@ void m68k_write_memory_8(unsigned int address, unsigned int value)
 #ifdef ALPINE_FUNCTIONS
        // Check if breakpoint on memory is active, and deal with it
        if (bpmActive && address == bpmAddress1)
-               M68KSetHalt();
+               M68KDebugHalt();
 #endif
 
        // Musashi does this automagically for you, UAE core does not :-P
@@ -1273,7 +1273,7 @@ void m68k_write_memory_16(unsigned int address, unsigned int value)
 #ifdef ALPINE_FUNCTIONS
        // Check if breakpoint on memory is active, and deal with it
        if (bpmActive && address == bpmAddress1)
-               M68KSetHalt();
+               M68KDebugHalt();
 #endif
 
        // Musashi does this automagically for you, UAE core does not :-P
@@ -1368,7 +1368,7 @@ void m68k_write_memory_32(unsigned int address, unsigned int value)
 #ifdef ALPINE_FUNCTIONS
        // Check if breakpoint on memory is active, and deal with it
        if (bpmActive && address == bpmAddress1)
-               M68KSetHalt();
+               M68KDebugHalt();
 #endif
 
        // Musashi does this automagically for you, UAE core does not :-P