From d12160dd21559fb20332dbf92d3c53bdecfdad67 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Wed, 6 Aug 2025 20:51:37 +0300 Subject: [PATCH] Gencpu warning fixes. --- cpustbl.cpp | 74 ++++++++++++++++++++++++------------------------ gencpu.cpp | 9 ++++-- include/newcpu.h | 2 ++ readcpu.cpp | 2 +- 4 files changed, 47 insertions(+), 40 deletions(-) diff --git a/cpustbl.cpp b/cpustbl.cpp index fbe23d5f..bcfd32a0 100644 --- a/cpustbl.cpp +++ b/cpustbl.cpp @@ -2545,7 +2545,7 @@ const struct cputbl op_smalltbl_0[] = { #ifndef CPUEMU_68000_ONLY { op_f800_0_ff, NULL, 0xf800, -1, { 0, 0 }, 0 }, /* LPSTOP */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_0 */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_1[] = { @@ -4520,7 +4520,7 @@ const struct cputbl op_smalltbl_1[] = { { op_f610_0_ff, NULL, 0xf610, -1, { 0, 0 }, 0 }, /* MOVE16 */ { op_f618_0_ff, NULL, 0xf618, -1, { 0, 0 }, 0 }, /* MOVE16 */ { op_f620_0_ff, NULL, 0xf620, -1, { 0, 0 }, 0 }, /* MOVE16 */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_2[] = { @@ -6452,7 +6452,7 @@ const struct cputbl op_smalltbl_2[] = { { op_f379_0_ff, NULL, 0xf379, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37a_0_ff, NULL, 0xf37a, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37b_0_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_3[] = { @@ -8283,7 +8283,7 @@ const struct cputbl op_smalltbl_3[] = { { op_f379_0_ff, NULL, 0xf379, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37a_0_ff, NULL, 0xf37a, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37b_0_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_4[] = { @@ -9869,7 +9869,7 @@ const struct cputbl op_smalltbl_4[] = { { op_e7f0_4_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_0_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_0_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_5[] = { @@ -11414,7 +11414,7 @@ const struct cputbl op_smalltbl_5[] = { { op_e7f0_4_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_0_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_0_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifdef CPUEMU_11 const struct cputbl op_smalltbl_11[] = { @@ -13058,7 +13058,7 @@ const struct cputbl op_smalltbl_11[] = { { op_e7f0_11_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_11_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_11_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_11 */ const struct cputbl op_smalltbl_12[] = { { op_0000_12_ff, NULL, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ @@ -14602,7 +14602,7 @@ const struct cputbl op_smalltbl_12[] = { { op_e7f0_12_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_12_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_12_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #ifdef CPUEMU_13 const struct cputbl op_smalltbl_13[] = { { NULL, op_0000_13_ff, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ @@ -16245,7 +16245,7 @@ const struct cputbl op_smalltbl_13[] = { { NULL, op_e7f0_13_ff, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { NULL, op_e7f8_13_ff, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { NULL, op_e7f9_13_ff, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_13 */ const struct cputbl op_smalltbl_14[] = { { NULL, op_0000_14_ff, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ @@ -17789,7 +17789,7 @@ const struct cputbl op_smalltbl_14[] = { { NULL, op_e7f0_14_ff, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { NULL, op_e7f8_14_ff, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { NULL, op_e7f9_14_ff, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #ifdef CPUEMU_20 #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_20[] = { @@ -20192,7 +20192,7 @@ const struct cputbl op_smalltbl_20[] = { #ifndef CPUEMU_68000_ONLY { op_f37b_20_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_20 */ #ifdef CPUEMU_21 @@ -22597,7 +22597,7 @@ const struct cputbl op_smalltbl_21[] = { #ifndef CPUEMU_68000_ONLY { NULL, op_f37b_21_ff, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_21 */ #ifdef CPUEMU_22 @@ -25029,7 +25029,7 @@ const struct cputbl op_smalltbl_22[] = { #ifndef CPUEMU_68000_ONLY { op_f37b_22_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_22 */ #ifdef CPUEMU_23 @@ -27461,7 +27461,7 @@ const struct cputbl op_smalltbl_23[] = { #ifndef CPUEMU_68000_ONLY { NULL, op_f37b_23_ff, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_23 */ #ifdef CPUEMU_24 @@ -30001,7 +30001,7 @@ const struct cputbl op_smalltbl_24[] = { #ifndef CPUEMU_68000_ONLY { NULL, op_f800_24_ff, 0xf800, -1, { 0, 0 }, 0 }, /* LPSTOP */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_24 */ #ifndef CPUEMU_68000_ONLY @@ -31977,7 +31977,7 @@ const struct cputbl op_smalltbl_25[] = { { NULL, op_f610_24_ff, 0xf610, -1, { 0, 0 }, 0 }, /* MOVE16 */ { NULL, op_f618_24_ff, 0xf618, -1, { 0, 0 }, 0 }, /* MOVE16 */ { NULL, op_f620_24_ff, 0xf620, -1, { 0, 0 }, 0 }, /* MOVE16 */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifdef CPUEMU_31 #ifndef CPUEMU_68000_ONLY @@ -34501,7 +34501,7 @@ const struct cputbl op_smalltbl_31[] = { #ifndef CPUEMU_68000_ONLY { op_f620_31_ff, NULL, 0xf620, -1, { 0, 0 }, 0 }, /* MOVE16 */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_31 */ #ifdef CPUEMU_32 @@ -36933,7 +36933,7 @@ const struct cputbl op_smalltbl_32[] = { #ifndef CPUEMU_68000_ONLY { op_f37b_32_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_32 */ #ifdef CPUEMU_33 @@ -39473,7 +39473,7 @@ const struct cputbl op_smalltbl_33[] = { #ifndef CPUEMU_68000_ONLY { op_f800_33_ff, NULL, 0xf800, -1, { 0, 0 }, 0 }, /* LPSTOP */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_33 */ #ifdef CPUEMU_34 @@ -41905,7 +41905,7 @@ const struct cputbl op_smalltbl_34[] = { #ifndef CPUEMU_68000_ONLY { op_f37b_34_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_34 */ #ifdef CPUEMU_35 @@ -44337,7 +44337,7 @@ const struct cputbl op_smalltbl_35[] = { #ifndef CPUEMU_68000_ONLY { NULL, op_f37b_35_ff, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #endif /* CPUEMU_35 */ #ifdef CPUEMU_40 @@ -46876,7 +46876,7 @@ const struct cputbl op_smalltbl_40[] = { #ifndef CPUEMU_68000_ONLY { op_f800_40_ff, NULL, 0xf800, -1, { 0, 0 }, 0 }, /* LPSTOP */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_40 */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_41[] = { @@ -48851,7 +48851,7 @@ const struct cputbl op_smalltbl_41[] = { { op_f610_40_ff, NULL, 0xf610, -1, { 0, 0 }, 0 }, /* MOVE16 */ { op_f618_40_ff, NULL, 0xf618, -1, { 0, 0 }, 0 }, /* MOVE16 */ { op_f620_40_ff, NULL, 0xf620, -1, { 0, 0 }, 0 }, /* MOVE16 */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_42[] = { @@ -50783,7 +50783,7 @@ const struct cputbl op_smalltbl_42[] = { { op_f379_40_ff, NULL, 0xf379, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37a_40_ff, NULL, 0xf37a, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37b_40_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_43[] = { @@ -52614,7 +52614,7 @@ const struct cputbl op_smalltbl_43[] = { { op_f379_40_ff, NULL, 0xf379, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37a_40_ff, NULL, 0xf37a, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37b_40_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_44[] = { @@ -54200,7 +54200,7 @@ const struct cputbl op_smalltbl_44[] = { { op_e7f0_44_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_40_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_40_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_45[] = { @@ -55745,7 +55745,7 @@ const struct cputbl op_smalltbl_45[] = { { op_e7f0_44_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_40_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_40_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ const struct cputbl op_smalltbl_46[] = { { op_0000_40_ff, NULL, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ @@ -57289,7 +57289,7 @@ const struct cputbl op_smalltbl_46[] = { { op_e7f0_44_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_40_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_40_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; const struct cputbl op_smalltbl_47[] = { { op_0000_40_ff, NULL, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ { op_0010_40_ff, NULL, 0x0010, 4, { 0, 0 }, 0 }, /* OR */ @@ -58832,7 +58832,7 @@ const struct cputbl op_smalltbl_47[] = { { op_e7f0_44_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_40_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_40_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; const struct cputbl op_smalltbl_48[] = { { op_0000_40_ff, NULL, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ { op_0010_40_ff, NULL, 0x0010, 4, { 0, 0 }, 0 }, /* OR */ @@ -60375,7 +60375,7 @@ const struct cputbl op_smalltbl_48[] = { { op_e7f0_44_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_40_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_40_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; const struct cputbl op_smalltbl_49[] = { { op_0000_40_ff, NULL, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ { op_0010_40_ff, NULL, 0x0010, 4, { 0, 0 }, 0 }, /* OR */ @@ -61918,7 +61918,7 @@ const struct cputbl op_smalltbl_49[] = { { op_e7f0_44_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_40_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_40_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #ifdef CPUEMU_50 const struct cputbl op_smalltbl_50[] = { { op_0000_50_ff, NULL, 0x0000, 4, { 0, 0 }, 0 }, /* OR */ @@ -64455,7 +64455,7 @@ const struct cputbl op_smalltbl_50[] = { #ifndef CPUEMU_68000_ONLY { op_f800_50_ff, NULL, 0xf800, -1, { 0, 0 }, 0 }, /* LPSTOP */ #endif -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_50 */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_51[] = { @@ -66430,7 +66430,7 @@ const struct cputbl op_smalltbl_51[] = { { op_f610_50_ff, NULL, 0xf610, -1, { 0, 0 }, 0 }, /* MOVE16 */ { op_f618_50_ff, NULL, 0xf618, -1, { 0, 0 }, 0 }, /* MOVE16 */ { op_f620_50_ff, NULL, 0xf620, -1, { 0, 0 }, 0 }, /* MOVE16 */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_52[] = { @@ -68362,7 +68362,7 @@ const struct cputbl op_smalltbl_52[] = { { op_f379_50_ff, NULL, 0xf379, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37a_50_ff, NULL, 0xf37a, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37b_50_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_53[] = { @@ -70193,7 +70193,7 @@ const struct cputbl op_smalltbl_53[] = { { op_f379_50_ff, NULL, 0xf379, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37a_50_ff, NULL, 0xf37a, -1, { 0, 0 }, 0 }, /* FRESTORE */ { op_f37b_50_ff, NULL, 0xf37b, -1, { 0, 0 }, 0 }, /* FRESTORE */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_54[] = { @@ -71779,7 +71779,7 @@ const struct cputbl op_smalltbl_54[] = { { op_e7f0_54_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_50_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_50_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ #ifndef CPUEMU_68000_ONLY const struct cputbl op_smalltbl_55[] = { @@ -73324,5 +73324,5 @@ const struct cputbl op_smalltbl_55[] = { { op_e7f0_54_ff, NULL, 0xe7f0, 4, { 4, 0 }, 0 }, /* ROLW */ { op_e7f8_50_ff, NULL, 0xe7f8, 4, { 0, 0 }, 0 }, /* ROLW */ { op_e7f9_50_ff, NULL, 0xe7f9, 6, { 0, 0 }, 0 }, /* ROLW */ -{ 0, 0 }}; +{ NULL, NULL, 0, 0, { 0, 0 }, 0 } }; #endif /* CPUEMU_68000_ONLY */ diff --git a/gencpu.cpp b/gencpu.cpp index 75708268..111059d6 100644 --- a/gencpu.cpp +++ b/gencpu.cpp @@ -9973,8 +9973,13 @@ static void generate_func (const char *extra) out("#endif\n\n"); } - if (generate_stbl) - fprintf(stblfile, "{ 0, 0 }};\n"); + if (generate_stbl) { +#ifdef NOFLAGS_SUPPORT_GENCPU + fprintf(stblfile, "{ NULL, NULL, NULL, NULL, 0, 0, { 0, 0 }, 0 } };\n"); +#else + fprintf(stblfile, "{ NULL, NULL, 0, 0, { 0, 0 }, 0 } };\n"); +#endif + } } #if CPU_TESTER diff --git a/include/newcpu.h b/include/newcpu.h index 9a1888c1..3bd8cbac 100644 --- a/include/newcpu.h +++ b/include/newcpu.h @@ -73,7 +73,9 @@ struct cputbl { uae_s8 length; uae_s8 disp020[2]; uae_s8 branch; +#ifdef JIT uae_u16 specific; +#endif }; #ifdef JIT diff --git a/readcpu.cpp b/readcpu.cpp index 61a87f01..d7ce6434 100644 --- a/readcpu.cpp +++ b/readcpu.cpp @@ -81,7 +81,7 @@ struct mnemolookup lookuptab[] = { { i_DIVS, _T("DIVS"), NULL, 1 }, { i_MULU, _T("MULU"), NULL, 1 }, { i_MULS, _T("MULS"), NULL, 1 }, - { i_ASR, _T("ASR"), NULL, }, + { i_ASR, _T("ASR"), NULL, 0 }, { i_ASL, _T("ASL"), NULL, 0 }, { i_LSR, _T("LSR"), NULL, 0 }, { i_LSL, _T("LSL"), NULL, 0 }, -- 2.47.3