| [hatari-devel] WinUAE CPU core disassembly wrapper |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-devel Archives
]
- To: Hatari Development <hatari-devel@xxxxxxxxxxxxxxxxxxx>
- Subject: [hatari-devel] WinUAE CPU core disassembly wrapper
- From: Eero Tamminen <oak@xxxxxxxxxxxxxx>
- Date: Sat, 1 Nov 2025 02:20:41 +0200
- Dkim-filter: OpenDKIM Filter v2.11.0 smtp.dnamail.fi 07C0C2113935
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=helsinkinet.fi; s=2025-03; t=1761956442; bh=Z5DfAKYXSrSMZglOXSDhY9BGq1SpGcWSz06lQxv+VTo=; h=Date:To:From:Subject:From; b=Ns9NDafwAOr19/6vD17pbMI0n63Jh4ya9+5KWQJX9qUk7czs+reK2HfzCJ/k3z7bn +hrwEeewBHSo5gqjK/fe24KPjB8oSxvzpb3p5+3lA+y34+H4NadMkSNPc3H25Fa9aT mKyBDsMrS/jyd4EuHXXh44apuYPOEeaZeFLgQ8MsESr2Rw5uSaLQHTU6bPM4ciheGN L8JDGxC+MFpaHZ83ljm0o1tUwSQeKiR5GrnDKv78uLOl8b8uDMiHUH5sq2G4L7Ea45 jkLualGI8/hAX2Xut+jtGtSc5kLXaENI2dzElNDQcAUd5zmpzScB0Aa0eItcHTnvJa IvvqAycEnxDog==
Hi,
Any objections if I drop the unused "lastpc" argument from Hatari's
WinUAE CPU core disassembly wrapper?
(See attached patch.)
- Eero
From af6117c99bac30e844b0a946e8049e97a033b721 Mon Sep 17 00:00:00 2001
From: Eero Tamminen <oak@xxxxxxxxxxxxxx>
Date: Fri, 31 Oct 2025 16:30:23 +0200
Subject: [PATCH] Remove redundant argument for m68k_disasm_file_wrapper()
---
src/cpu/newcpu.c | 15 ++++++++-------
src/cpu/newcpu.h | 2 +-
src/debug/68kDisass.c | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/cpu/newcpu.c b/src/cpu/newcpu.c
index 2b67f2ec..ca020a33 100644
--- a/src/cpu/newcpu.c
+++ b/src/cpu/newcpu.c
@@ -7918,14 +7918,15 @@ void m68k_disasm_file (FILE *f, uaecptr addr, uaecptr *nextpc, uaecptr lastpc, i
* Functions called from debug/68Disass.c, we need to check if MMU is enabled to do some address
* translations on 'addr' if needed, depending on the CPU/MMU family
*/
-void m68k_disasm_file_wrapper (FILE *f, uaecptr addr, uaecptr *nextpc, uaecptr lastpc, int cnt)
+void m68k_disasm_file_wrapper (FILE *f, uaecptr addr, uaecptr *nextpc, int cnt)
{
- uaecptr new_addr = addr;
-
- if ( currprefs.cpu_model == 68030 && currprefs.mmu_model ) /* 68030 with MMU */
- new_addr = mmu030_translate(addr, regs.s != 0, false, false);
-
- m68k_disasm_file(f, new_addr, nextpc, new_addr, cnt);
+ if (currprefs.mmu_model) {
+ /* 68030 with MMU */
+ if (currprefs.cpu_model == 68030)
+ addr = mmu030_translate(addr, regs.s != 0, false, false);
+ /* TODO: 040 / 060 */
+ }
+ m68k_disasm_file(f, addr, nextpc, addr, cnt);
}
#endif
diff --git a/src/cpu/newcpu.h b/src/cpu/newcpu.h
index 5d54e49b..a7044fb7 100644
--- a/src/cpu/newcpu.h
+++ b/src/cpu/newcpu.h
@@ -749,7 +749,7 @@ extern void m68k_disasm (uaecptr addr, uaecptr *nextpc, uaecptr lastpc, int cnt)
extern uae_u32 m68k_disasm_2(TCHAR *buf, int bufsize, uaecptr pc, uae_u16 *bufpc, int bufpccount, uaecptr *nextpc, int cnt, uae_u32 *seaddr, uae_u32 *deaddr, uaecptr lastpc, int safemode);
#ifdef WINUAE_FOR_HATARI
extern void m68k_disasm_file (FILE *f, uaecptr addr, uaecptr *nextpc, uaecptr lastpc, int cnt);
-extern void m68k_disasm_file_wrapper (FILE *f, uaecptr addr, uaecptr *nextpc, uaecptr lastpc, int cnt);
+extern void m68k_disasm_file_wrapper (FILE *f, uaecptr addr, uaecptr *nextpc, int cnt);
#endif
extern void sm68k_disasm (TCHAR*, TCHAR*, uaecptr addr, uaecptr *nextpc, uaecptr lastpc);
extern int m68k_asm(TCHAR *buf, uae_u16 *out, uaecptr pc);
diff --git a/src/debug/68kDisass.c b/src/debug/68kDisass.c
index c44dcc1c..05165b74 100644
--- a/src/debug/68kDisass.c
+++ b/src/debug/68kDisass.c
@@ -315,7 +315,7 @@ void Disasm (FILE *f, uaecptr addr, uaecptr *nextpc, int cnt)
}
#endif
- m68k_disasm_file_wrapper (f, addr, nextpc, addr, cnt);
+ m68k_disasm_file_wrapper (f, addr, nextpc, cnt);
}
/**
--
2.39.5