From 7d159690612614e3253de879af3e73fbb13538d9 Mon Sep 17 00:00:00 2001 From: Jose Tejada Date: Fri, 3 Nov 2023 17:34:10 +0100 Subject: [PATCH] minor --- .../driver => cores/karnov/doc}/karnov.cpp | 0 cores/karnov/ver/game/debug.gtkw | 49 +++++++++++++++++++ cores/karnov/ver/game/trace.mame | 9 ++++ cores/karnov/ver/game/trace.sh | 2 + modules/fx68k | 2 +- modules/jtframe/hdl/cpu/jtframe_m68k.v | 3 +- modules/jtframe/src/jtutil/cmd/trace.go | 11 ++--- 7 files changed, 67 insertions(+), 9 deletions(-) rename {doc/mame/driver => cores/karnov/doc}/karnov.cpp (100%) create mode 100644 cores/karnov/ver/game/debug.gtkw create mode 100644 cores/karnov/ver/game/trace.mame create mode 100755 cores/karnov/ver/game/trace.sh diff --git a/doc/mame/driver/karnov.cpp b/cores/karnov/doc/karnov.cpp similarity index 100% rename from doc/mame/driver/karnov.cpp rename to cores/karnov/doc/karnov.cpp diff --git a/cores/karnov/ver/game/debug.gtkw b/cores/karnov/ver/game/debug.gtkw new file mode 100644 index 000000000..ba789c6b4 --- /dev/null +++ b/cores/karnov/ver/game/debug.gtkw @@ -0,0 +1,49 @@ +[*] +[*] GTKWave Analyzer v3.3.103 (w)1999-2019 BSI +[*] Fri Nov 3 14:14:49 2023 +[*] +[dumpfile] "/home/jtejada/jtcores/cores/karnov/ver/game/test.fst" +[dumpfile_mtime] "Fri Nov 3 14:13:20 2023" +[dumpfile_size] 30257149 +[savefile] "/home/jtejada/jtcores/cores/karnov/ver/game/debug.gtkw" +[timestart] 10416 +[size] 1264 1024 +[pos] -1 -1 +*-33.765762 15327647400 15327647400 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 +[treeopen] TOP. +[treeopen] TOP.game_test. +[treeopen] TOP.game_test.u_game. +[treeopen] TOP.game_test.u_game.u_game. +[treeopen] TOP.game_test.u_game.u_game.u_main. +[treeopen] TOP.game_test.u_game.u_game.u_main.u_cpu. +[treeopen] TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu. +[sst_width] 223 +[signals_width] 289 +[sst_expanded] 1 +[sst_vpaned_height] 301 +@24 +TOP.game_test.frame_cnt[31:0] +TOP.game_test.u_game.u_game.u_main.IPLn[2:0] +@201 +- +@22 +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.SSP[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.PC[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A0[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A1[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A2[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A3[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A4[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A5[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A6[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.A7[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D0[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D1[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D2[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D3[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D4[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D5[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D6[31:0] +TOP.game_test.u_game.u_game.u_main.u_cpu.u_cpu.excUnit.D7[31:0] +[pattern_trace] 1 +[pattern_trace] 0 diff --git a/cores/karnov/ver/game/trace.mame b/cores/karnov/ver/game/trace.mame new file mode 100644 index 000000000..1c6eb818a --- /dev/null +++ b/cores/karnov/ver/game/trace.mame @@ -0,0 +1,9 @@ +focus 0 +trace off +trace debug.trace,maincpu,noloop,{tracelog "PC=%X,SSP=%X,D0=%X,D1=%X,D2=%X,D3=%X,D4=%X,D5=%X,D6=%X,D7=%X,A0=%X,A1=%X,A2=%X,A3=%X,A4=%X,A5=%X,A6=%X,A7=%X,IR=%X,frame_cnt=%x* ",rPC,sp,d0,d1,d2,d3,d4,d5,d6,d7,a0,a1,a2,a3,a4,a5,a6,usp,ir,frame} +gvblank +gvblank +gvblank +gvblank +traceflush +trace off diff --git a/cores/karnov/ver/game/trace.sh b/cores/karnov/ver/game/trace.sh new file mode 100755 index 000000000..d4d7706a6 --- /dev/null +++ b/cores/karnov/ver/game/trace.sh @@ -0,0 +1,2 @@ +#!/bin/bash +~/mame/mame karnov -debug -debugscript trace.mame diff --git a/modules/fx68k b/modules/fx68k index 14149f59e..673a1eb14 160000 --- a/modules/fx68k +++ b/modules/fx68k @@ -1 +1 @@ -Subproject commit 14149f59e8f02bad287289d88ff572357270ede3 +Subproject commit 673a1eb144bb57e24a25bd323e56dd2550f8f9c3 diff --git a/modules/jtframe/hdl/cpu/jtframe_m68k.v b/modules/jtframe/hdl/cpu/jtframe_m68k.v index 0689e3edb..8113031b6 100644 --- a/modules/jtframe/hdl/cpu/jtframe_m68k.v +++ b/modules/jtframe/hdl/cpu/jtframe_m68k.v @@ -62,8 +62,7 @@ module jtframe_m68k( output [2:0] FC ); -`ifdef VERILATOR_KEEP_68K /* verilator tracing_on */ - `else /* verilator tracing_off */ `endif +`ifndef VERILATOR_KEEP_CPU /* verilator tracing_off */ `endif `ifdef JTFRAME_J68 jtframe_j68 u_cpu( .clk ( clk ), diff --git a/modules/jtframe/src/jtutil/cmd/trace.go b/modules/jtframe/src/jtutil/cmd/trace.go index 796368991..3acf992a2 100644 --- a/modules/jtframe/src/jtutil/cmd/trace.go +++ b/modules/jtframe/src/jtutil/cmd/trace.go @@ -78,27 +78,22 @@ func makeMAME( cpu string ) { var s string switch strings.ToLower(cpu) { case "t900h": s=`trace debug.trace,maincpu,noloop,{tracelog "PC=%X,XWA0=%X,XBC0=%X,XDE0=%X,XHL0=%X,XWA1=%X,XBC1=%X,XDE1=%X,XHL1=%X,XWA2=%X,XBC2=%X,XDE2=%X,XHL2=%X,XWA3=%X,XBC3=%X,XDE3=%X,XHL3=%X,XIX=%X,XIY=%X,XIZ=%X,XSP=%X,* ",pc,xwa0,xbc0,xde0,xhl0,xwa1,xbc1,xde1,xhl1,xwa2,xbc2,xde2,xhl2,xwa3,xbc3,xde3,xhl3,xix,xiy,xiz,xssp} -go ` case "m6801": s=`focus 0 trace off trace debug.trace,maincpu,noloop,{tracelog "pc=%X,acca=%X,accb=%X,xreg=%X,sp=%X,cc=%x,frame_cnt=%x* ",pc,a,b,s,x,cc,frame} -go ` case "m68000","m68k","68k","68000": s=`focus 0 trace off -trace debug.trace,maincpu,noloop,{tracelog "PC=%X,SSP=%X,D0=%X,D1=%X,D2=%X,D3=%X,D4=%X,D5=%X,D6=%X,D7=%X,A0=%X,A1=%X,A2=%X,A3=%X,A4=%X,A5=%X,A6=%X,A7=%X,IR=%X,frame_cnt=%x* ",pc,ssp,d0,d1,d2,d3,d4,d5,d6,d7,a0,a1,a2,a3,a4,a5,a6,a7,ir,frame} -go +trace debug.trace,maincpu,noloop,{tracelog "PC=%X,SSP=%X,D0=%X,D1=%X,D2=%X,D3=%X,D4=%X,D5=%X,D6=%X,D7=%X,A0=%X,A1=%X,A2=%X,A3=%X,A4=%X,A5=%X,A6=%X,A7=%X,IR=%X,frame_cnt=%x* ",rPC,SSP,d0,d1,d2,d3,d4,d5,d6,d7,a0,a1,a2,a3,a4,a5,a6,USP,ir,frame} ` case "konami","kcpu","6809": s=`focus 0 trace off trace debug.trace,maincpu,noloop,{tracelog "PC=%X,cc=%X,dp=%x,a=%x,b=%x,x=%x,y=%x,u=%x,s=%x,frame_cnt=%x* ",pc,cc,dp,a,b,x,y,u,s,frame} -go ` case "qsnd","qsound": s=`trace debug.trace,2,,{tracelog "! pc=%X pt=%X pr=%X pi=%X i=%X r0=%X r1=%X r2=%X r3=%X rb=%X re=%X j=%X k=%X x=%X y=%X p=%X a0=%X a1=%X c0=%X c1=%X c2=%X auc=%X psw=%X\n",pc,pt,pr,pi,i,r0,r1,r2,r3,rb,re,j,k,x,y,p,a0,a1,c0,c1,c2,auc,psw} -go ` } if s=="" { @@ -112,6 +107,10 @@ qsnd, qsound `) return } + s += ` +gtime 100 +traceflush +` f, e := os.Create("trace.mame") defer f.Close() if e!=nil {