Use proper pc get function.

diff --git a/enforcer.cpp b/enforcer.cpp
index 8d097b06400b1f75b0cc54948935c6bbdfd06412..af5107e50c0d20f26184a3219852d3ee1e9086ec 100644 (file)
--- a/enforcer.cpp
+++ b/enforcer.cpp
@@ -429,7 +429,7 @@ uae_u32 REGPARAM2 chipmem_lget2 (uaecptr addr)
 
        if (ISILLEGAL_LONG (addr))
        {
-               enforcer_display_hit (_T("LONG READ from"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+               enforcer_display_hit (_T("LONG READ from"), m68k_getpc (), addr);
                if (enforcermode & 1)
                        set_special (SPCFLAG_TRAP);
        }
@@ -446,7 +446,7 @@ uae_u32 REGPARAM2 chipmem_wget2(uaecptr addr)
 
        if (ISILLEGAL_WORD (addr))
        {
-               enforcer_display_hit (_T("WORD READ from"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+               enforcer_display_hit (_T("WORD READ from"), m68k_getpc (), addr);
                if (enforcermode & 1)
                        set_special (SPCFLAG_TRAP);
        }
@@ -460,7 +460,7 @@ uae_u32 REGPARAM2 chipmem_bget2 (uaecptr addr)
 
        if (ISILLEGAL_BYTE (addr))
        {
-               enforcer_display_hit (_T("BYTE READ from"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+               enforcer_display_hit (_T("BYTE READ from"), m68k_getpc (), addr);
                if (enforcermode & 1)
                        set_special (SPCFLAG_TRAP);
        }
@@ -478,7 +478,7 @@ void REGPARAM2 chipmem_lput2 (uaecptr addr, uae_u32 l)
 
        if (ISILLEGAL_LONG (addr))
        {
-               enforcer_display_hit (_T("LONG WRITE to"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+               enforcer_display_hit (_T("LONG WRITE to"), m68k_getpc (), addr);
                if (enforcermode & 1)
                        if (addr != 0x100)
                                set_special (SPCFLAG_TRAP);
@@ -498,7 +498,7 @@ void REGPARAM2 chipmem_wput2 (uaecptr addr, uae_u32 w)
 
        if (ISILLEGAL_WORD (addr))
        {
-               enforcer_display_hit (_T("WORD WRITE to"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+               enforcer_display_hit (_T("WORD WRITE to"), m68k_getpc (), addr);
                if (enforcermode & 1)
                        set_special (SPCFLAG_TRAP);
        }
@@ -514,7 +514,7 @@ void REGPARAM2 chipmem_bput2 (uaecptr addr, uae_u32 b)
 
        if (ISILLEGAL_BYTE (addr))
        {
-               enforcer_display_hit (_T("BYTE WRITE to"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+               enforcer_display_hit (_T("BYTE WRITE to"), m68k_getpc (), addr);
                if (enforcermode & 1)
                        set_special (SPCFLAG_TRAP);
        }
@@ -540,7 +540,7 @@ uae_u8 * REGPARAM2 chipmem_xlate2 (uaecptr addr)
 uae_u32 REGPARAM2 dummy_lget2 (uaecptr addr)
 {
        special_mem_r;
-       enforcer_display_hit (_T("LONG READ from"),(uae_u32)(regs.pc_p - NMEM_OFFSET), addr);
+       enforcer_display_hit (_T("LONG READ from"), m68k_getpc (), addr);
        if (enforcermode & 1) {
                set_special (SPCFLAG_TRAP);
                return 0;
@@ -560,12 +560,12 @@ uae_u32 REGPARAM2 dummy_wget2 (uaecptr addr)
        if (addr >= 0x00F10000 && addr <= 0x00F7FFFF) {
                if (!warned_JIT_0xF10000) {
                        warned_JIT_0xF10000 = 1;
-                       enforcer_display_hit (_T("LONG READ from"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+                       enforcer_display_hit (_T("LONG READ from"), m68k_getpc (), addr);
                }
                return 0;
        }
 #endif
-       enforcer_display_hit (_T("WORD READ from"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+       enforcer_display_hit (_T("WORD READ from"), m68k_getpc (), addr);
        if (enforcermode & 1) {
                set_special (SPCFLAG_TRAP);
                return 0;
@@ -576,7 +576,7 @@ uae_u32 REGPARAM2 dummy_wget2 (uaecptr addr)
 uae_u32        REGPARAM2 dummy_bget2 (uaecptr addr)
 {
        special_mem_r;
-       enforcer_display_hit (_T("BYTE READ from"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+       enforcer_display_hit (_T("BYTE READ from"), m68k_getpc (), addr);
        if (enforcermode & 1) {
                set_special (SPCFLAG_TRAP);
                return 0;
@@ -587,7 +587,7 @@ uae_u32     REGPARAM2 dummy_bget2 (uaecptr addr)
 void REGPARAM2 dummy_lput2 (uaecptr addr, uae_u32 l)
 {
        special_mem_w;
-       enforcer_display_hit (_T("LONG WRITE to"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+       enforcer_display_hit (_T("LONG WRITE to"), m68k_getpc (), addr);
        if (enforcermode & 1) {
                set_special (SPCFLAG_TRAP);
                return;
@@ -597,7 +597,7 @@ void REGPARAM2 dummy_lput2 (uaecptr addr, uae_u32 l)
 void REGPARAM2 dummy_wput2 (uaecptr addr, uae_u32 w)
 {
        special_mem_w;
-       enforcer_display_hit (_T("WORD WRITE to"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+       enforcer_display_hit (_T("WORD WRITE to"), m68k_getpc (), addr);
        if (enforcermode & 1) {
                set_special (SPCFLAG_TRAP);
                return;
@@ -607,7 +607,7 @@ void REGPARAM2 dummy_wput2 (uaecptr addr, uae_u32 w)
 void REGPARAM2 dummy_bput2 (uaecptr addr, uae_u32 b)
 {
        special_mem_w;
-       enforcer_display_hit (_T("BYTE WRITE to"),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+       enforcer_display_hit (_T("BYTE WRITE to"), m68k_getpc (), addr);
        if (enforcermode & 1) {
                set_special (SPCFLAG_TRAP);
                return;
@@ -617,7 +617,7 @@ void REGPARAM2 dummy_bput2 (uaecptr addr, uae_u32 b)
 int REGPARAM2 dummy_check2 (uaecptr addr, uae_u32 size)
 {
        special_mem_r;
-       enforcer_display_hit (_T("CHECK from "),(uae_u32)(regs.pc_p - NMEM_OFFSET),addr);
+       enforcer_display_hit (_T("CHECK from "), m68k_getpc (), addr);
        return 0;
 }