--- uae/src/newcpu.c 2018/04/24 17:10:48 1.1.1.20 +++ uae/src/newcpu.c 2018/04/24 17:16:34 1.1.1.23 @@ -9,7 +9,6 @@ #include "sysconfig.h" #include "sysdeps.h" -#include "config.h" #include "options.h" #include "events.h" #include "uae.h" @@ -17,6 +16,7 @@ #include "custom.h" #include "newcpu.h" #include "autoconf.h" +#include "traps.h" #include "ersatz.h" #include "debug.h" #include "gui.h" @@ -34,8 +34,8 @@ static int last_writeaccess_for_exceptio /* instruction (1) or data (0) access */ static int last_instructionaccess_for_exception_3; -int areg_byteinc[] = { 1,1,1,1,1,1,1,2 }; -int imm8_table[] = { 8,1,2,3,4,5,6,7 }; +const int areg_byteinc[] = { 1,1,1,1,1,1,1,2 }; +const int imm8_table[] = { 8,1,2,3,4,5,6,7 }; int movem_index1[256]; int movem_index2[256]; @@ -117,11 +117,10 @@ static void build_cpufunctbl (void) : currprefs.cpu_level == 3 ? op_smalltbl_1_ff : currprefs.cpu_level == 2 ? op_smalltbl_2_ff : currprefs.cpu_level == 1 ? op_smalltbl_3_ff - : ! currprefs.cpu_compatible ? op_smalltbl_4_ff : op_smalltbl_5_ff); - write_log ("Building CPU function table (%d %d %d).\n", - currprefs.cpu_level, currprefs.cpu_compatible, currprefs.address_space_24); + write_log ("Building CPU function table (%d %d).\n", + currprefs.cpu_level, currprefs.address_space_24); for (opcode = 0; opcode < 65536; opcode++) cpufunctbl[opcode] = op_illg_1; @@ -177,16 +176,6 @@ static void update_68k_cycles (void) void check_prefs_changed_cpu (void) { - if (currprefs.cpu_level != changed_prefs.cpu_level - || currprefs.cpu_compatible != changed_prefs.cpu_compatible) - { - if (!currprefs.cpu_compatible && changed_prefs.cpu_compatible) - fill_prefetch_slow (); - - currprefs.cpu_level = changed_prefs.cpu_level; - currprefs.cpu_compatible = changed_prefs.cpu_compatible; - build_cpufunctbl (); - } if (currprefs.m68k_speed != changed_prefs.m68k_speed) { currprefs.m68k_speed = changed_prefs.m68k_speed; reset_frame_rate_hack (); @@ -237,33 +226,31 @@ void init_m68k (void) write_log ("Building CPU table for configuration: 68"); regs.address_space_mask = 0xffffffff; if (currprefs.address_space_24 && currprefs.cpu_level > 1) - write_log ("EC"); + write_log ("EC"); switch (currprefs.cpu_level) { case 1: - write_log ("010"); - break; + write_log ("010"); + break; case 2: - write_log ("020"); - break; + write_log ("020"); + break; case 3: - write_log ("020/881"); - break; + write_log ("020/881"); + break; case 4: - /* Who is going to miss the MMU anyway...? :-) */ - write_log ("040"); - break; + /* Who is going to miss the MMU anyway...? :-) */ + write_log ("040"); + break; default: - write_log ("000"); - break; + write_log ("000"); + break; } - if (currprefs.cpu_compatible) - write_log (" (compatible mode)"); if (currprefs.address_space_24) { regs.address_space_mask = 0x00ffffff; write_log (" 24-bit addressing"); } write_log ("\n"); - + read_table68k (); do_merges (); @@ -311,7 +298,7 @@ uae_s32 ShowEA (FILE *f, int reg, amodes break; case Ad16: disp16 = get_iword_1 (m68kpc_offset); m68kpc_offset += 2; - addr = m68k_areg(regs,reg) + (uae_s16)disp16; + addr = m68k_areg (regs,reg) + (uae_s16)disp16; sprintf (buffer,"(A%d,$%04x) == $%08lx", reg, disp16 & 0xffff, (unsigned long)addr); break; @@ -319,13 +306,13 @@ uae_s32 ShowEA (FILE *f, int reg, amodes dp = get_iword_1 (m68kpc_offset); m68kpc_offset += 2; disp8 = dp & 0xFF; r = (dp & 0x7000) >> 12; - dispreg = dp & 0x8000 ? m68k_areg(regs,r) : m68k_dreg(regs,r); + dispreg = dp & 0x8000 ? m68k_areg (regs,r) : m68k_dreg(regs,r); if (!(dp & 0x800)) dispreg = (uae_s32)(uae_s16)(dispreg); dispreg <<= (dp >> 9) & 3; if (dp & 0x100) { uae_s32 outer = 0, disp = 0; - uae_s32 base = m68k_areg(regs,reg); + uae_s32 base = m68k_areg (regs,reg); char name[10]; sprintf (name,"A%d, ",reg); if (dp & 0x80) { base = 0; name[0] = 0; } @@ -348,7 +335,7 @@ uae_s32 ShowEA (FILE *f, int reg, amodes disp,outer, (unsigned long)addr); } else { - addr = m68k_areg(regs,reg) + (uae_s32)((uae_s8)disp8) + dispreg; + addr = m68k_areg (regs,reg) + (uae_s32)((uae_s8)disp8) + dispreg; sprintf (buffer,"(A%d, %c%d.%c*%d, $%02x) == $%08lx", reg, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), disp8, @@ -366,7 +353,7 @@ uae_s32 ShowEA (FILE *f, int reg, amodes dp = get_iword_1 (m68kpc_offset); m68kpc_offset += 2; disp8 = dp & 0xFF; r = (dp & 0x7000) >> 12; - dispreg = dp & 0x8000 ? m68k_areg(regs,r) : m68k_dreg(regs,r); + dispreg = dp & 0x8000 ? m68k_areg (regs,r) : m68k_dreg(regs,r); if (!(dp & 0x800)) dispreg = (uae_s32)(uae_s16)(dispreg); dispreg <<= (dp >> 9) & 3; @@ -486,7 +473,7 @@ static int verify_ea (int reg, amodes mo break; case Ad16: disp16 = get_iword_1 (m68kpc_offset); m68kpc_offset += 2; - addr = m68k_areg(regs,reg) + (uae_s16)disp16; + addr = m68k_areg (regs,reg) + (uae_s16)disp16; break; case Ad8r: addr = m68k_areg (regs, reg); @@ -494,7 +481,7 @@ static int verify_ea (int reg, amodes mo dp = get_iword_1 (m68kpc_offset); m68kpc_offset += 2; disp8 = dp & 0xFF; r = (dp & 0x7000) >> 12; - dispreg = dp & 0x8000 ? m68k_areg(regs,r) : m68k_dreg(regs,r); + dispreg = dp & 0x8000 ? m68k_areg (regs,r) : m68k_dreg(regs,r); if (!(dp & 0x800)) dispreg = (uae_s32)(uae_s16)(dispreg); dispreg <<= (dp >> 9) & 3; @@ -672,31 +659,31 @@ void MakeFromSR (void) if (olds != regs.s) { if (olds) { if (oldm) - regs.msp = m68k_areg(regs, 7); + regs.msp = m68k_areg (regs, 7); else - regs.isp = m68k_areg(regs, 7); - m68k_areg(regs, 7) = regs.usp; + regs.isp = m68k_areg (regs, 7); + m68k_areg (regs, 7) = regs.usp; } else { - regs.usp = m68k_areg(regs, 7); - m68k_areg(regs, 7) = regs.m ? regs.msp : regs.isp; + regs.usp = m68k_areg (regs, 7); + m68k_areg (regs, 7) = regs.m ? regs.msp : regs.isp; } } else if (olds && oldm != regs.m) { if (oldm) { - regs.msp = m68k_areg(regs, 7); - m68k_areg(regs, 7) = regs.isp; + regs.msp = m68k_areg (regs, 7); + m68k_areg (regs, 7) = regs.isp; } else { - regs.isp = m68k_areg(regs, 7); - m68k_areg(regs, 7) = regs.msp; + regs.isp = m68k_areg (regs, 7); + m68k_areg (regs, 7) = regs.msp; } } } else { if (olds != regs.s) { if (olds) { - regs.isp = m68k_areg(regs, 7); - m68k_areg(regs, 7) = regs.usp; + regs.isp = m68k_areg (regs, 7); + m68k_areg (regs, 7) = regs.usp; } else { - regs.usp = m68k_areg(regs, 7); - m68k_areg(regs, 7) = regs.isp; + regs.usp = m68k_areg (regs, 7); + m68k_areg (regs, 7) = regs.isp; } } } @@ -705,7 +692,7 @@ void MakeFromSR (void) if (regs.t1 || regs.t0) set_special (SPCFLAG_TRACE); else - /* Keep SPCFLAG_DOTRACE, we still want a trace exception for + /* Keep SPCFLAG_DOTRACE, we still want a trace exception for SR-modifying instructions (including STOP). */ unset_special (SPCFLAG_TRACE); } @@ -728,7 +715,7 @@ static void exception_debug (int nr) #ifdef DEBUGGER if (!exception_debugging) return; - console_out ("Exception %d, PC=%08.8X\n", nr, m68k_getpc()); + console_out ("Exception %d, PC=%08.8X\n", nr, m68k_getpc()); #endif } @@ -741,11 +728,11 @@ void Exception_normal (int nr, uaecptr o MakeSR(); if (!regs.s) { - regs.usp = m68k_areg(regs, 7); + regs.usp = m68k_areg (regs, 7); if (currprefs.cpu_level >= 2) - m68k_areg(regs, 7) = regs.m ? regs.msp : regs.isp; + m68k_areg (regs, 7) = regs.m ? regs.msp : regs.isp; else - m68k_areg(regs, 7) = regs.isp; + m68k_areg (regs, 7) = regs.isp; regs.s = 1; } if (currprefs.cpu_level > 0) { @@ -754,94 +741,97 @@ void Exception_normal (int nr, uaecptr o if (currprefs.cpu_level >= 4) { /* 68040 */ if (nr == 2) { for (i = 0 ; i < 18 ; i++) { - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); } - m68k_areg(regs, 7) -= 4; - put_long (m68k_areg(regs, 7), last_fault_for_exception_3); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0x0140 | (sv ? 6 : 2)); /* SSW */ - m68k_areg(regs, 7) -= 4; - put_long (m68k_areg(regs, 7), last_addr_for_exception_3); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0x7000 + nr * 4); + m68k_areg (regs, 7) -= 4; + put_long (m68k_areg (regs, 7), last_fault_for_exception_3); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0x0140 | (sv ? 6 : 2)); /* SSW */ + m68k_areg (regs, 7) -= 4; + put_long (m68k_areg (regs, 7), last_addr_for_exception_3); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0x7000 + nr * 4); } else { - m68k_areg(regs, 7) -= 4; - put_long (m68k_areg(regs, 7), last_fault_for_exception_3); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0x2000 + nr * 4); + m68k_areg (regs, 7) -= 4; + put_long (m68k_areg (regs, 7), last_fault_for_exception_3); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0x2000 + nr * 4); } } else { uae_u16 ssw = (sv ? 4 : 0) | (last_instructionaccess_for_exception_3 ? 2 : 1); ssw |= last_writeaccess_for_exception_3 ? 0 : 0x40; ssw |= 0x20; for (i = 0 ; i < 36; i++) { - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); } - m68k_areg(regs, 7) -= 4; - put_long (m68k_areg(regs, 7), last_fault_for_exception_3); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), ssw); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0xb000 + nr * 4); + m68k_areg (regs, 7) -= 4; + put_long (m68k_areg (regs, 7), last_fault_for_exception_3); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), ssw); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0xb000 + nr * 4); } +#if 0 write_log ("Exception %d (%x) at %x -> %x!\n", nr, oldpc, currpc, get_long (regs.vbr + 4*nr)); +#endif + } else if (nr ==5 || nr == 6 || nr == 7 || nr == 9) { - m68k_areg(regs, 7) -= 4; - put_long (m68k_areg(regs, 7), oldpc); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0x2000 + nr * 4); + m68k_areg (regs, 7) -= 4; + put_long (m68k_areg (regs, 7), oldpc); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0x2000 + nr * 4); } else if (regs.m && nr >= 24 && nr < 32) { /* M + Interrupt */ - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), nr * 4); - m68k_areg(regs, 7) -= 4; - put_long (m68k_areg(regs, 7), currpc); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), regs.sr); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), nr * 4); + m68k_areg (regs, 7) -= 4; + put_long (m68k_areg (regs, 7), currpc); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), regs.sr); regs.sr |= (1 << 13); - regs.msp = m68k_areg(regs, 7); - m68k_areg(regs, 7) = regs.isp; - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), 0x1000 + nr * 4); + regs.msp = m68k_areg (regs, 7); + m68k_areg (regs, 7) = regs.isp; + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), 0x1000 + nr * 4); } else { - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), nr * 4); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), nr * 4); } } else if (nr == 2 || nr == 3) { uae_u16 mode = (sv ? 4 : 0) | (last_instructionaccess_for_exception_3 ? 2 : 1); - mode |= last_writeaccess_for_exception_3 ? 0 : 16; - m68k_areg(regs, 7) -= 14; + mode |= last_writeaccess_for_exception_3 ? 0 : 16; + m68k_areg (regs, 7) -= 14; /* fixme: bit3=I/N */ - put_word (m68k_areg(regs, 7) + 0, mode); - put_long (m68k_areg(regs, 7) + 2, last_fault_for_exception_3); - put_word (m68k_areg(regs, 7) + 6, last_op_for_exception_3); - put_word (m68k_areg(regs, 7) + 8, regs.sr); - put_long (m68k_areg(regs, 7) + 10, last_addr_for_exception_3); - write_log ("Exception %d (%x) at %x -> %x!\n", nr, oldpc, currpc, get_long (regs.vbr + 4*nr)); + put_word (m68k_areg (regs, 7) + 0, mode); + put_long (m68k_areg (regs, 7) + 2, last_fault_for_exception_3); + put_word (m68k_areg (regs, 7) + 6, last_op_for_exception_3); + put_word (m68k_areg (regs, 7) + 8, regs.sr); + put_long (m68k_areg (regs, 7) + 10, last_addr_for_exception_3); + write_log ("Exception %d (%x) at %x -> %x!\n", nr, oldpc, currpc, get_long (regs.vbr + 4*nr)); goto kludge_me_do; } - m68k_areg(regs, 7) -= 4; - put_long (m68k_areg(regs, 7), currpc); - m68k_areg(regs, 7) -= 2; - put_word (m68k_areg(regs, 7), regs.sr); + m68k_areg (regs, 7) -= 4; + put_long (m68k_areg (regs, 7), currpc); + m68k_areg (regs, 7) -= 2; + put_word (m68k_areg (regs, 7), regs.sr); kludge_me_do: newpc = get_long (regs.vbr + 4 * nr); if (newpc & 1) { if (nr == 2 || nr == 3) - uae_reset (); /* there is nothing else we can do.. */ + uae_reset (1); /* there is nothing else we can do.. */ else exception3 (regs.ir, m68k_getpc(), newpc); return; @@ -890,12 +880,12 @@ int m68k_move2c (int regno, uae_u32 *reg case 5: itt1 = *regp & 0xffffe364; break; case 6: dtt0 = *regp & 0xffffe364; break; case 7: dtt1 = *regp & 0xffffe364; break; - + case 0x800: regs.usp = *regp; break; case 0x801: regs.vbr = *regp; break; case 0x802: caar = *regp & 0xfc; break; - case 0x803: regs.msp = *regp; if (regs.m == 1) m68k_areg(regs, 7) = regs.msp; break; - case 0x804: regs.isp = *regp; if (regs.m == 0) m68k_areg(regs, 7) = regs.isp; break; + case 0x803: regs.msp = *regp; if (regs.m == 1) m68k_areg (regs, 7) = regs.msp; break; + case 0x804: regs.isp = *regp; if (regs.m == 0) m68k_areg (regs, 7) = regs.isp; break; case 0x805: mmusr = *regp; break; case 0x806: urp = *regp; break; case 0x807: srp = *regp; break; @@ -928,8 +918,8 @@ int m68k_movec2 (int regno, uae_u32 *reg case 0x800: *regp = regs.usp; break; case 0x801: *regp = regs.vbr; break; case 0x802: *regp = caar; break; - case 0x803: *regp = regs.m == 1 ? m68k_areg(regs, 7) : regs.msp; break; - case 0x804: *regp = regs.m == 0 ? m68k_areg(regs, 7) : regs.isp; break; + case 0x803: *regp = regs.m == 1 ? m68k_areg (regs, 7) : regs.msp; break; + case 0x804: *regp = regs.m == 0 ? m68k_areg (regs, 7) : regs.isp; break; case 0x805: *regp = mmusr; break; case 0x806: *regp = urp; break; case 0x807: *regp = srp; break; @@ -1192,24 +1182,32 @@ void m68k_mull (uae_u32 opcode, uae_u32 } #endif } -static char* ccnames[] = +static const char *ccnames[] = { "T ","F ","HI","LS","CC","CS","NE","EQ", "VC","VS","PL","MI","GE","LT","GT","LE" }; void m68k_reset (void) { + if (currprefs.cpu_level != changed_prefs.cpu_level + || currprefs.address_space_24 != changed_prefs.address_space_24) + { + currprefs.address_space_24 = changed_prefs.address_space_24; + currprefs.cpu_level = changed_prefs.cpu_level; + build_cpufunctbl (); + } + regs.kick_mask = 0x00F80000; regs.spcflags = 0; if (savestate_state == STATE_RESTORE) { - m68k_setpc (regs.pc); + m68k_setpc (regs.pc); /* MakeFromSR() must not swap stack pointer */ regs.s = (regs.sr >> 13) & 1; MakeFromSR(); /* set stack pointer */ if (regs.s) - m68k_areg(regs, 7) = regs.isp; + m68k_areg (regs, 7) = regs.isp; else - m68k_areg(regs, 7) = regs.usp; + m68k_areg (regs, 7) = regs.usp; return; } @@ -1235,7 +1233,7 @@ void m68k_reset (void) unsigned long REGPARAM2 op_illg (uae_u32 opcode) { uaecptr pc = m68k_getpc (); - + if (cloanto_rom && (opcode & 0xF100) == 0x7100) { m68k_dreg (regs, (opcode >> 9) & 7) = (uae_s8)(opcode & 0xFF); m68k_incpc (2); @@ -1362,14 +1360,14 @@ static int do_specialties (int cycles) do_copper (); } - if (regs.spcflags & SPCFLAG_DOTRACE) { + if (regs.spcflags & SPCFLAG_DOTRACE) Exception (9,last_trace_ad); - } + while (regs.spcflags & SPCFLAG_STOP) { do_cycles (4 * CYCLE_UNIT); if (regs.spcflags & SPCFLAG_COPPER) do_copper (); - if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)){ + if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)) { int intr = intlev (); unset_special (SPCFLAG_INT | SPCFLAG_DOINT); if (intr != -1 && intr > regs.intmask) { @@ -1451,7 +1449,7 @@ static void m68k_run_2 (void) /*n_insns++;*/ cycles &= cycles_mask; cycles |= cycles_val; - do_cycles (cycles); + do_cycles (cycles); if (regs.spcflags) { if (do_specialties (cycles)) return; @@ -1520,10 +1518,10 @@ void m68k_go (int may_quit) /* system is very badly confused */ write_log ("double bus error or corrupted stack, forcing reboot..\n"); regs.panic = 0; - uae_reset (); + uae_reset (1); } } - m68k_run1 (currprefs.cpu_compatible ? m68k_run_1 : m68k_run_2); + m68k_run1 (currprefs.cpu_level == 0 ? m68k_run_1 : m68k_run_2); } in_m68k_go--; } @@ -1623,12 +1621,12 @@ void m68k_dumpstate (FILE *f, uaecptr *n if ((i & 3) == 3) fprintf (f, "\n"); } for (i = 0; i < 8; i++){ - fprintf (f, "A%d: %08lx ", i, m68k_areg(regs, i)); + fprintf (f, "A%d: %08lx ", i, m68k_areg (regs, i)); if ((i & 3) == 3) fprintf (f, "\n"); } - if (regs.s == 0) regs.usp = m68k_areg(regs, 7); - if (regs.s && regs.m) regs.msp = m68k_areg(regs, 7); - if (regs.s && regs.m == 0) regs.isp = m68k_areg(regs, 7); + if (regs.s == 0) regs.usp = m68k_areg (regs, 7); + if (regs.s && regs.m) regs.msp = m68k_areg (regs, 7); + if (regs.s && regs.m == 0) regs.isp = m68k_areg (regs, 7); fprintf (f, "USP=%08lx ISP=%08lx MSP=%08lx VBR=%08lx\n", regs.usp,regs.isp,regs.msp,regs.vbr); fprintf (f, "T=%d%d S=%d M=%d X=%d N=%d Z=%d V=%d C=%d IMASK=%d\n", @@ -1655,7 +1653,7 @@ void m68k_dumpstate (FILE *f, uaecptr *n #define CPUTYPE_EC 1 #define CPUMODE_HALT 1 -uae_u8 *restore_cpu (uae_u8 *src) +const uae_u8 *restore_cpu (const uae_u8 *src) { int i,model,flags; uae_u32 l; @@ -1712,12 +1710,15 @@ uae_u8 *restore_cpu (uae_u8 *src) static int cpumodel[] = { 68000, 68010, 68020, 68020 }; -uae_u8 *save_cpu (int *len) +uae_u8 *save_cpu (int *len, uae_u8 *dstptr) { uae_u8 *dstbak,*dst; int model,i; - dstbak = dst = malloc(4+4+15*4+4+4+4+4+2+4+4+4+4+4+4+4); + if (dstptr) + dstbak = dst = dstptr; + else + dstbak = dst = malloc(4+4+15*4+4+4+4+4+2+4+4+4+4+4+4+4); model = cpumodel[currprefs.cpu_level]; save_u32 (model); /* MODEL */ save_u32 (currprefs.address_space_24 ? 1 : 0); /* FLAGS */