--- uae/src/newcpu.c 2018/04/24 16:38:39 1.1 +++ uae/src/newcpu.c 2018/04/24 16:39:07 1.1.1.2 @@ -11,14 +11,15 @@ #include "config.h" #include "options.h" +#include "machdep/m68k.h" #include "events.h" #include "gui.h" #include "memory.h" #include "custom.h" +#include "readcpu.h" #include "newcpu.h" #include "autoconf.h" #include "ersatz.h" -#include "readcpu.h" #include "blitter.h" #include "debug.h" #include "compiler.h" @@ -35,15 +36,8 @@ int fpp_movem_index2[256]; int fpp_movem_next[256]; cpuop_func *cpufunctbl[65536]; - -#ifdef NEED_TO_DEBUG_BADLY -void m68k_setpc(CPTR newpc) -{ - if (newpc <= 12) - fprintf(stderr, "BAR at %x\n", m68k_getpc()), regs.spcflags |= SPCFLAG_BRK; - regs.pc = newpc; - regs.pc_p = regs.pc_oldp = get_real_address(newpc); -} +#if USER_PROGRAMS_BEHAVE > 0 +cpuop_func *cpufunctbl_behaved[65536]; #endif #define COUNT_INSTRS 0 @@ -131,9 +125,9 @@ void init_m68k (void) do_merges (); for (opcode = 0; opcode < 65536; opcode++) cpufunctbl[opcode] = op_illg; - for (i = 0; smallcputbl[i].handler != NULL; i++) { - if (!smallcputbl[i].specific) - cpufunctbl[smallcputbl[i].opcode] = smallcputbl[i].handler; + for (i = 0; op_smalltbl[i].handler != NULL; i++) { + if (!op_smalltbl[i].specific) + cpufunctbl[op_smalltbl[i].opcode] = op_smalltbl[i].handler; } for (opcode = 0; opcode < 65536; opcode++) { cpuop_func *f; @@ -148,19 +142,44 @@ void init_m68k (void) cpufunctbl[opcode] = f; } } - for (i = 0; smallcputbl[i].handler != NULL; i++) { - if (smallcputbl[i].specific) - cpufunctbl[smallcputbl[i].opcode] = smallcputbl[i].handler; + for (i = 0; op_smalltbl[i].handler != NULL; i++) { + if (op_smalltbl[i].specific) + cpufunctbl[op_smalltbl[i].opcode] = op_smalltbl[i].handler; + } +#if USER_PROGRAMS_BEHAVE > 0 + for (opcode = 0; opcode < 65536; opcode++) + cpufunctbl_behaved[opcode] = op_illg; + + for (i = 0; op_direct_smalltbl[i].handler != NULL; i++) { + if (!op_direct_smalltbl[i].specific) + cpufunctbl_behaved[op_direct_smalltbl[i].opcode] = op_direct_smalltbl[i].handler; + } + for (opcode = 0; opcode < 65536; opcode++) { + cpuop_func *f; + + if (table68k[opcode].mnemo == i_ILLG) + continue; + + if (table68k[opcode].handler != -1) { + f = cpufunctbl_behaved[table68k[opcode].handler]; + if (f == op_illg) + abort(); + cpufunctbl_behaved[opcode] = f; + } + } + for (i = 0; op_direct_smalltbl[i].handler != NULL; i++) { + if (op_direct_smalltbl[i].specific) + cpufunctbl_behaved[op_direct_smalltbl[i].opcode] = op_direct_smalltbl[i].handler; } +#endif } struct regstruct regs, lastint_regs; static struct regstruct regs_backup[16]; static int backup_pointer = 0; int lastint_no; -struct flag_struct regflags; -static LONG ShowEA(int reg, amodes mode, wordsizes size) +LONG ShowEA(int reg, amodes mode, wordsizes size, char *buf) { UWORD dp; BYTE disp8; @@ -169,40 +188,41 @@ static LONG ShowEA(int reg, amodes mode, ULONG dispreg; CPTR addr; LONG offset = 0; + char buffer[80]; switch(mode){ case Dreg: - printf("D%d", reg); + sprintf(buffer,"D%d", reg); break; case Areg: - printf("A%d", reg); + sprintf(buffer,"A%d", reg); break; case Aind: - printf("(A%d)", reg); + sprintf(buffer,"(A%d)", reg); break; case Aipi: - printf("(A%d)+", reg); + sprintf(buffer,"(A%d)+", reg); break; case Apdi: - printf("-(A%d)", reg); + sprintf(buffer,"-(A%d)", reg); break; case Ad16: disp16 = nextiword(); - addr = regs.a[reg] + (WORD)disp16; - printf("(A%d,$%04x) == $%08lx", reg, disp16 & 0xffff, + addr = m68k_areg(regs,reg) + (WORD)disp16; + sprintf(buffer,"(A%d,$%04x) == $%08lx", reg, disp16 & 0xffff, (long unsigned int)addr); break; case Ad8r: dp = nextiword(); disp8 = dp & 0xFF; r = (dp & 0x7000) >> 12; - dispreg = dp & 0x8000 ? regs.a[r] : regs.d[r]; + dispreg = dp & 0x8000 ? m68k_areg(regs,r) : m68k_dreg(regs,r); if (!(dp & 0x800)) dispreg = (LONG)(WORD)(dispreg); dispreg <<= (dp >> 9) & 3; if (dp & 0x100) { LONG outer = 0, disp = 0; - LONG base = regs.a[reg]; + LONG base = m68k_areg(regs,reg); char name[10]; sprintf(name,"A%d, ",reg); if (dp & 0x80) { base = 0; name[0] = 0; } @@ -219,15 +239,15 @@ static LONG ShowEA(int reg, amodes mode, if (dp & 4) base += dispreg; addr = base + outer; - printf("(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name, + sprintf(buffer,"(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), disp,outer, (long unsigned int)addr); } else { - addr = regs.a[reg] + (LONG)((BYTE)disp8) + dispreg; - printf("(A%d, %c%d.%c*%d, $%02x) == $%08lx", reg, + addr = m68k_areg(regs,reg) + (LONG)((BYTE)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, (long unsigned int)addr); @@ -237,14 +257,14 @@ static LONG ShowEA(int reg, amodes mode, addr = m68k_getpc(); disp16 = nextiword(); addr += (WORD)disp16; - printf("(PC,$%04x) == $%08lx", disp16 & 0xffff,(long unsigned int)addr); + sprintf(buffer,"(PC,$%04x) == $%08lx", disp16 & 0xffff,(long unsigned int)addr); break; case PC8r: addr = m68k_getpc(); dp = nextiword(); disp8 = dp & 0xFF; r = (dp & 0x7000) >> 12; - dispreg = dp & 0x8000 ? regs.a[r] : regs.d[r]; + dispreg = dp & 0x8000 ? m68k_areg(regs,r) : m68k_dreg(regs,r); if (!(dp & 0x800)) dispreg = (LONG)(WORD)(dispreg); dispreg <<= (dp >> 9) & 3; @@ -268,57 +288,60 @@ static LONG ShowEA(int reg, amodes mode, if (dp & 4) base += dispreg; addr = base + outer; - printf("(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name, + sprintf(buffer,"(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), disp,outer, (long unsigned int)addr); - } - else { + } else { addr += (LONG)((BYTE)disp8) + dispreg; - printf("(PC, %c%d.%c*%d, $%02x) == $%08lx", dp & 0x8000 ? 'A' : 'D', + sprintf(buffer,"(PC, %c%d.%c*%d, $%02x) == $%08lx", dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), disp8, (long unsigned int)addr); } break; case absw: - printf("$%08lx", (LONG)(WORD)nextiword()); + sprintf(buffer,"$%08lx", (long unsigned int)(LONG)(WORD)nextiword()); break; case absl: - printf("$%08lx", nextilong()); + sprintf(buffer,"$%08lx", (long unsigned int)nextilong()); break; case imm: switch(size){ case sz_byte: - printf("#$%02x", nextiword() & 0xff); break; + sprintf(buffer,"#$%02x", (unsigned int)(nextiword() & 0xff)); break; case sz_word: - printf("#$%04x", nextiword() & 0xffff); break; + sprintf(buffer,"#$%04x", (unsigned int)(nextiword() & 0xffff)); break; case sz_long: - printf("#$%08lx", nextilong()); break; + sprintf(buffer,"#$%08lx", (long unsigned int)(nextilong())); break; default: break; } break; case imm0: offset = (LONG)(BYTE)nextiword(); - printf("#$%02lx", offset & 0xff); + sprintf(buffer,"#$%02x", (unsigned int)(offset & 0xff)); break; case imm1: offset = (LONG)(WORD)nextiword(); - printf("#$%04lx", offset & 0xffff); + sprintf(buffer,"#$%04x", (unsigned int)(offset & 0xffff)); break; case imm2: offset = (LONG)nextilong(); - printf("#$%08lx", (ULONG)offset); + sprintf(buffer,"#$%08lx", (long unsigned int)offset); break; case immi: offset = (LONG)(BYTE)(reg & 0xff); - printf("#$%08lx", (ULONG)offset); + sprintf(buffer,"#$%08lx", (long unsigned int)offset); break; default: break; } - return(offset); + if (buf == 0) + printf("%s", buffer); + else + strcat(buf, buffer); + return offset; } void MakeSR(void) @@ -359,33 +382,31 @@ void MakeFromSR(void) if (olds != regs.s) { if (olds) { if (oldm) - regs.msp = regs.a[7]; + regs.msp = m68k_areg(regs, 7); else - regs.isp = regs.a[7]; - regs.a[7] = regs.usp; - } - else { - regs.usp = regs.a[7]; - regs.a[7] = regs.m ? regs.msp : regs.isp; + 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; } } else if (olds && oldm != regs.m) { if (oldm) { - regs.msp = regs.a[7]; - regs.a[7] = regs.isp; - } - else { - regs.isp = regs.a[7]; - regs.a[7] = regs.msp; + 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; } } } else { if (olds != regs.s) { if (olds) { - regs.isp = regs.a[7]; - regs.a[7] = regs.usp; + regs.isp = m68k_areg(regs, 7); + m68k_areg(regs, 7) = regs.usp; } else { - regs.usp = regs.a[7]; - regs.a[7] = regs.isp; + regs.usp = m68k_areg(regs, 7); + m68k_areg(regs, 7) = regs.isp; } } } @@ -399,50 +420,51 @@ void MakeFromSR(void) void Exception(int nr, CPTR oldpc) { + compiler_flush_jsr_stack(); MakeSR(); if (!regs.s) { - regs.usp = regs.a[7]; + regs.usp = m68k_areg(regs, 7); if (CPU_LEVEL >= 2) - regs.a[7] = regs.m ? regs.msp : regs.isp; + m68k_areg(regs, 7) = regs.m ? regs.msp : regs.isp; else - regs.a[7] = regs.isp; + m68k_areg(regs, 7) = regs.isp; regs.s = 1; } if (CPU_LEVEL > 0) { if (nr == 2 || nr == 3) { int i; for (i = 0 ; i < 12 ; i++) { - regs.a[7] -= 2; - put_word (regs.a[7], 0); + m68k_areg(regs, 7) -= 2; + put_word (m68k_areg(regs, 7), 0); } - regs.a[7] -= 2; - put_word (regs.a[7], 0xa000 + nr * 4); + m68k_areg(regs, 7) -= 2; + put_word (m68k_areg(regs, 7), 0xa000 + nr * 4); } else if (nr ==5 || nr == 6 || nr == 7 || nr == 9) { - regs.a[7] -= 4; - put_long (regs.a[7], oldpc); - regs.a[7] -= 2; - put_word (regs.a[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) { - regs.a[7] -= 2; - put_word (regs.a[7], nr * 4); - regs.a[7] -= 4; - put_long (regs.a[7], m68k_getpc ()); - regs.a[7] -= 2; - put_word (regs.a[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), m68k_getpc ()); + m68k_areg(regs, 7) -= 2; + put_word (m68k_areg(regs, 7), regs.sr); regs.sr |= (1 << 13); - regs.msp = regs.a[7]; - regs.a[7] = regs.isp; - regs.a[7] -= 2; - put_word (regs.a[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 { - regs.a[7] -= 2; - put_word (regs.a[7], nr * 4); + m68k_areg(regs, 7) -= 2; + put_word (m68k_areg(regs, 7), nr * 4); } } - regs.a[7] -= 4; - put_long (regs.a[7], m68k_getpc ()); - regs.a[7] -= 2; - put_word (regs.a[7], regs.sr); + m68k_areg(regs, 7) -= 4; + put_long (m68k_areg(regs, 7), m68k_getpc ()); + m68k_areg(regs, 7) -= 2; + put_word (m68k_areg(regs, 7), regs.sr); m68k_setpc(get_long(regs.vbr + 4*nr)); regs.t1 = regs.t0 = regs.m = 0; regs.spcflags &= ~(SPCFLAG_TRACE | SPCFLAG_DOTRACE); @@ -473,8 +495,8 @@ void m68k_move2c (int regno, ULONG *regp 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) regs.a[7] = regs.msp; break; - case 0x804: regs.isp = *regp; if (regs.m == 0) regs.a[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; default: op_illg (0x4E7B); break; @@ -493,8 +515,8 @@ void m68k_movec2 (int regno, ULONG *regp case 0x800: *regp = regs.usp; break; case 0x801: *regp = regs.vbr; break; case 0x802: *regp = caar; break; - case 0x803: *regp = regs.m == 1 ? regs.a[7] : regs.msp; break; - case 0x804: *regp = regs.m == 0 ? regs.a[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; default: op_illg (0x4E7A); break; @@ -511,9 +533,9 @@ div_unsigned(ULONG src_hi, ULONG src_lo, return(1); } for (i = 0 ; i < 32 ; i++) { - cbit = src_hi & 0x80000000; + cbit = src_hi & 0x80000000ul; src_hi <<= 1; - if (src_lo & 0x80000000) src_hi++; + if (src_lo & 0x80000000ul) src_hi++; src_lo <<= 1; q = q << 1; if (cbit || div <= src_hi) { @@ -535,17 +557,17 @@ void m68k_divl (ULONG opcode, ULONG src, } if (extra & 0x800) { /* signed variant */ - INT_64BIT a = (INT_64BIT)(LONG)regs.d[(extra >> 12) & 7]; + INT_64BIT a = (INT_64BIT)(LONG)m68k_dreg(regs, (extra >> 12) & 7); INT_64BIT quot, rem; if (extra & 0x400) { a &= 0xffffffffLL; - a |= (INT_64BIT)regs.d[extra & 7] << 32; + a |= (INT_64BIT)m68k_dreg(regs, extra & 7) << 32; } rem = a % (INT_64BIT)(LONG)src; quot = a / (INT_64BIT)(LONG)src; - if ((quot & 0xffffffff80000000LL) != 0 && - (quot & 0xffffffff80000000LL) != 0xffffffff80000000LL) { + if ((quot & 0xffffffff80000000uLL) != 0 && + (quot & 0xffffffff80000000uLL) != 0xffffffff80000000uLL) { VFLG = NFLG = 1; CFLG = 0; } @@ -554,17 +576,17 @@ void m68k_divl (ULONG opcode, ULONG src, VFLG = CFLG = 0; ZFLG = ((LONG)quot) == 0; NFLG = ((LONG)quot) < 0; - regs.d[extra & 7] = rem; - regs.d[(extra >> 12) & 7] = quot; + m68k_dreg(regs, extra & 7) = rem; + m68k_dreg(regs, (extra >> 12) & 7) = quot; } } else { /* unsigned */ - unsigned INT_64BIT a = (unsigned INT_64BIT)(ULONG)regs.d[(extra >> 12) & 7]; + unsigned INT_64BIT a = (unsigned INT_64BIT)(ULONG)m68k_dreg(regs, (extra >> 12) & 7); unsigned INT_64BIT quot, rem; if (extra & 0x400) { a &= 0xffffffffLL; - a |= (unsigned INT_64BIT)regs.d[extra & 7] << 32; + a |= (unsigned INT_64BIT)m68k_dreg(regs, extra & 7) << 32; } rem = a % (unsigned INT_64BIT)src; quot = a / (unsigned INT_64BIT)src; @@ -576,8 +598,8 @@ void m68k_divl (ULONG opcode, ULONG src, VFLG = CFLG = 0; ZFLG = ((LONG)quot) == 0; NFLG = ((LONG)quot) < 0; - regs.d[extra & 7] = rem; - regs.d[(extra >> 12) & 7] = quot; + m68k_dreg(regs, extra & 7) = rem; + m68k_dreg(regs, (extra >> 12) & 7) = quot; } } #else @@ -587,14 +609,14 @@ void m68k_divl (ULONG opcode, ULONG src, } if (extra & 0x800) { /* signed variant */ - LONG lo = (LONG)regs.d[(extra >> 12) & 7]; + LONG lo = (LONG)m68k_dreg(regs, (extra >> 12) & 7); LONG hi = lo < 0 ? -1 : 0; LONG save_high; ULONG quot, rem; ULONG sign; if (extra & 0x400) { - hi = (LONG)regs.d[extra & 7]; + hi = (LONG)m68k_dreg(regs, extra & 7); } save_high = hi; sign = (hi ^ src); @@ -615,17 +637,17 @@ void m68k_divl (ULONG opcode, ULONG src, VFLG = CFLG = 0; ZFLG = ((LONG)quot) == 0; NFLG = ((LONG)quot) < 0; - regs.d[extra & 7] = rem; - regs.d[(extra >> 12) & 7] = quot; + m68k_dreg(regs, extra & 7) = rem; + m68k_dreg(regs, (extra >> 12) & 7) = quot; } } else { /* unsigned */ - ULONG lo = (ULONG)regs.d[(extra >> 12) & 7]; + ULONG lo = (ULONG)m68k_dreg(regs, (extra >> 12) & 7); ULONG hi = 0; ULONG quot, rem; if (extra & 0x400) { - hi = (ULONG)regs.d[extra & 7]; + hi = (ULONG)m68k_dreg(regs, extra & 7); } if (div_unsigned(hi, lo, src, ", &rem)) { VFLG = NFLG = 1; @@ -635,8 +657,8 @@ void m68k_divl (ULONG opcode, ULONG src, VFLG = CFLG = 0; ZFLG = ((LONG)quot) == 0; NFLG = ((LONG)quot) < 0; - regs.d[extra & 7] = rem; - regs.d[(extra >> 12) & 7] = quot; + m68k_dreg(regs, extra & 7) = rem; + m68k_dreg(regs, (extra >> 12) & 7) = quot; } } #endif @@ -651,10 +673,10 @@ mul_unsigned(ULONG src1, ULONG src2, ULO ULONG r3 = ((src1 >> 16) & 0xffff) * ((src2 >> 16) & 0xffff); ULONG lo; - lo = r0 + ((r1 << 16) & 0xffff0000); + lo = r0 + ((r1 << 16) & 0xffff0000ul); if (lo < r0) r3++; r0 = lo; - lo = r0 + ((r2 << 16) & 0xffff0000); + lo = r0 + ((r2 << 16) & 0xffff0000ul); if (lo < r0) r3++; r3 += ((r1 >> 16) & 0xffff) + ((r2 >> 16) & 0xffff); *dst_lo = lo; @@ -666,33 +688,33 @@ void m68k_mull (ULONG opcode, ULONG src, #if defined(INT_64BIT) if (extra & 0x800) { /* signed variant */ - INT_64BIT a = (INT_64BIT)(LONG)regs.d[(extra >> 12) & 7]; + INT_64BIT a = (INT_64BIT)(LONG)m68k_dreg(regs, (extra >> 12) & 7); a *= (INT_64BIT)(LONG)src; VFLG = CFLG = 0; ZFLG = a == 0; NFLG = a < 0; if (extra & 0x400) - regs.d[extra & 7] = a >> 32; - else if ((a & 0xffffffff80000000LL) != 0 && - (a & 0xffffffff80000000LL) != 0xffffffff80000000LL) { + m68k_dreg(regs, extra & 7) = a >> 32; + else if ((a & 0xffffffff80000000uLL) != 0 && + (a & 0xffffffff80000000uLL) != 0xffffffff80000000uLL) { VFLG = 1; } - regs.d[(extra >> 12) & 7] = (ULONG)a; + m68k_dreg(regs, (extra >> 12) & 7) = (ULONG)a; } else { /* unsigned */ - unsigned INT_64BIT a = (unsigned INT_64BIT)(ULONG)regs.d[(extra >> 12) & 7]; + unsigned INT_64BIT a = (unsigned INT_64BIT)(ULONG)m68k_dreg(regs, (extra >> 12) & 7); a *= (unsigned INT_64BIT)src; VFLG = CFLG = 0; ZFLG = a == 0; NFLG = ((INT_64BIT)a) < 0; if (extra & 0x400) - regs.d[extra & 7] = a >> 32; - else if ((a & 0xffffffff00000000LL) != 0) { + m68k_dreg(regs, extra & 7) = a >> 32; + else if ((a & 0xffffffff00000000uLL) != 0) { VFLG = 1; } - regs.d[(extra >> 12) & 7] = (ULONG)a; + m68k_dreg(regs, (extra >> 12) & 7) = (ULONG)a; } #else if (extra & 0x800) { @@ -702,7 +724,7 @@ void m68k_mull (ULONG opcode, ULONG src, ULONG sign; src1 = (LONG)src; - src2 = (LONG)regs.d[(extra >> 12) & 7]; + src2 = (LONG)m68k_dreg(regs, (extra >> 12) & 7); sign = (src1 ^ src2); if (src1 < 0) src1 = -src1; if (src2 < 0) src2 = -src2; @@ -716,28 +738,28 @@ void m68k_mull (ULONG opcode, ULONG src, ZFLG = dst_hi == 0 && dst_lo == 0; NFLG = ((LONG)dst_hi) < 0; if (extra & 0x400) - regs.d[extra & 7] = dst_hi; + m68k_dreg(regs, extra & 7) = dst_hi; else if ((dst_hi != 0 || (dst_lo & 0x80000000) != 0) && ((dst_hi & 0xffffffff) != 0xffffffff || (dst_lo & 0x80000000) != 0x80000000)) { VFLG = 1; } - regs.d[(extra >> 12) & 7] = dst_lo; + m68k_dreg(regs, (extra >> 12) & 7) = dst_lo; } else { /* unsigned */ ULONG dst_lo,dst_hi; - mul_unsigned(src,(ULONG)regs.d[(extra >> 12) & 7],&dst_hi,&dst_lo); + mul_unsigned(src,(ULONG)m68k_dreg(regs, (extra >> 12) & 7),&dst_hi,&dst_lo); VFLG = CFLG = 0; ZFLG = dst_hi == 0 && dst_lo == 0; NFLG = ((LONG)dst_hi) < 0; if (extra & 0x400) - regs.d[extra & 7] = dst_hi; + m68k_dreg(regs, extra & 7) = dst_hi; else if (dst_hi != 0) { VFLG = 1; } - regs.d[(extra >> 12) & 7] = dst_lo; + m68k_dreg(regs, (extra >> 12) & 7) = dst_lo; } #endif } @@ -747,8 +769,9 @@ static char* ccnames[] = void m68k_reset(void) { - regs.a[7] = get_long(0x00f80000); + m68k_areg(regs, 7) = get_long(0x00f80000); m68k_setpc(get_long(0x00f80004)); + regs.kick_mask = 0xF80000; regs.s = 1; regs.m = 0; regs.stopped = 0; @@ -762,8 +785,9 @@ void m68k_reset(void) customreset(); } -void op_illg(ULONG opcode) +void REGPARAM2 op_illg(ULONG opcode) { + compiler_flush_jsr_stack(); if (opcode == 0x4E7B && get_long(0x10) == 0 && (m68k_getpc() & 0xF80000) == 0xF80000) { @@ -772,10 +796,16 @@ void op_illg(ULONG opcode) regs.spcflags |= SPCFLAG_BRK; quit_program = 1; } - if (opcode == 0xFF0D && ((m68k_getpc() & 0xF80000) == 0xF80000)) { - /* This is from the dummy Kickstart replacement */ - ersatz_perform (nextiword ()); - return; + if (opcode == 0xFF0D) { + if ((m68k_getpc() & 0xF80000) == 0xF80000) { + /* This is from the dummy Kickstart replacement */ + ersatz_perform (nextiword ()); + return; + } else if ((m68k_getpc() & 0xF80000) == 0xF00000) { + /* User-mode STOP replacement */ + m68k_setstopped(1); + return; + } } #ifdef USE_POINTER regs.pc_p -= 2; @@ -806,21 +836,6 @@ void mmu_op(ULONG opcode, UWORD extra) static int n_insns=0, n_spcinsns=0; -static __inline__ void do_hardware(void) -{ - if (regs.spcflags & SPCFLAG_BLIT) { - do_blitter(); -#if FAST_BLITTER == 0 - do_blitter(); - do_blitter(); - do_blitter(); -#endif - } - if (regs.spcflags & SPCFLAG_DISK) { - do_disk(); - } -} - static CPTR last_trace_ad = 0; static __inline__ void do_trace(void) @@ -845,7 +860,7 @@ static __inline__ void do_trace(void) && cctrue((opcode >> 8) & 0xf)) || ((opcode & 0xf0f0) == 0x5050 /* DBcc */ && !cctrue((opcode >> 8) & 0xf) - && (WORD)regs.d[opcode & 7] != 0)) + && (WORD)m68k_dreg(regs, opcode & 7) != 0)) { last_trace_ad = m68k_getpc(); regs.spcflags &= ~SPCFLAG_TRACE; @@ -859,7 +874,7 @@ static __inline__ void do_trace(void) } } -static __inline__ void m68k_run_1(void) +static void m68k_run_1(void) { regs.spcflags &= ~(SPCFLAG_EMULTRAP); for(;;) { @@ -870,13 +885,16 @@ static __inline__ void m68k_run_1(void) instrcount[opcode]++; #endif #if defined(X86_ASSEMBLY) - __asm__ ("movl %0,%%ebx\n\tmovb (%%ebx),%%ah\n\tmovb 1(%%ebx),%%al\n\taddl $2,%0\n\tandl $65535,%%eax\n\tmovl cpufunctbl(,%%eax,4),%%ebx\n\tcall *%%ebx" - : "=m" (regs.pc_p) - : "0" (regs.pc_p) - : "%eax", "%edx", "%ecx", "%esi", "%edi", "%ebx", "%ebp", "memory", "cc"); + { + ULONG opcode = nextiword(); + __asm__ __volatile__("\tcall *%%ebx" + : : "b" (cpufunctbl[opcode]), "a" (opcode) + : "%eax", "%ebx", "%edx", "%ecx", + "%esi", "%edi", "%ebp", "memory", "cc"); + } #else { - UWORD opcode = nextiword(); + ULONG opcode = nextiword(); (*cpufunctbl[opcode])(opcode); } #endif @@ -892,18 +910,112 @@ static __inline__ void m68k_run_1(void) do_cycles(); if (regs.spcflags) { /*n_spcinsns++;*/ - while (regs.spcflags & SPCFLAG_BLTNASTY) { /* 9 */ + while (regs.spcflags & SPCFLAG_BLTNASTY) { + do_cycles(); + if (regs.spcflags & SPCFLAG_DISK) + do_disk(); + } + run_compiled_code(); + if (regs.spcflags & SPCFLAG_DOTRACE) { + Exception(9,last_trace_ad); + } + while (regs.spcflags & SPCFLAG_STOP) { + do_cycles(); + if (regs.spcflags & SPCFLAG_DISK) + do_disk(); + if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT | SPCFLAG_TIMER)){ + int intr = intlev(); + regs.spcflags &= ~(SPCFLAG_INT | SPCFLAG_DOINT); + if (intr != -1 && intr > regs.intmask) { + Interrupt(intr); + regs.stopped = 0; + regs.spcflags &= ~SPCFLAG_STOP; + } + } + } + do_trace(); +#ifdef WANT_SLOW_MULTIPLY + /* Kludge for Hardwired demo. The guys who wrote it should be + * mutilated. */ + if (regs.spcflags & SPCFLAG_EXTRA_CYCLES) { + do_cycles (); do_cycles (); do_cycles (); do_cycles (); + regs.spcflags &= ~SPCFLAG_EXTRA_CYCLES; + } +#endif + if (regs.spcflags & SPCFLAG_DISK) + do_disk(); + + if (regs.spcflags & (SPCFLAG_DOINT|SPCFLAG_TIMER)) { + int intr = intlev(); + regs.spcflags &= ~SPCFLAG_DOINT; + if (intr != -1 && intr > regs.intmask) { + Interrupt(intr); + regs.stopped = 0; + } + } + if (regs.spcflags & SPCFLAG_INT) { + regs.spcflags &= ~SPCFLAG_INT; + regs.spcflags |= SPCFLAG_DOINT; + } + if (regs.spcflags & (SPCFLAG_BRK|SPCFLAG_MODE_CHANGE)) { + regs.spcflags &= ~(SPCFLAG_BRK|SPCFLAG_MODE_CHANGE); + return; + } + } + } +} + +#if USER_PROGRAMS_BEHAVE > 0 +static void m68k_run_2(void) +{ + regs.spcflags &= ~(SPCFLAG_EMULTRAP); + for(;;) { + + /* assert (!regs.stopped && !(regs.spcflags & SPCFLAG_STOP)); */ +/* regs_backup[backup_pointer = (backup_pointer + 1) % 16] = regs;*/ +#if COUNT_INSTRS + instrcount[opcode]++; +#endif +#if defined(X86_ASSEMBLY) + { + ULONG opcode = nextiword(); + __asm__ __volatile__("\tcall *%%ebx" + : : "b" (cpufunctbl_behaved[opcode]), "a" (opcode) + : "%eax", "%ebx", "%edx", "%ecx", + "%esi", "%edi", "%ebp", "memory", "cc"); + } +#else + { + ULONG opcode = nextiword(); + (*cpufunctbl_behaved[opcode])(opcode); + } +#endif +#ifndef NO_EXCEPTION_3 + if (buserr) { + Exception(3,0); + buserr = 0; + } +#endif + if (regs.spcflags & SPCFLAG_EMULTRAP) + return; + /*n_insns++;*/ + do_cycles(); + if (regs.spcflags) { + /*n_spcinsns++;*/ + while (regs.spcflags & SPCFLAG_BLTNASTY) { do_cycles(); - do_hardware(); + if (regs.spcflags & SPCFLAG_DISK) + do_disk(); } run_compiled_code(); - if (regs.spcflags & SPCFLAG_DOTRACE) { /* 7 */ + if (regs.spcflags & SPCFLAG_DOTRACE) { Exception(9,last_trace_ad); } - while (regs.spcflags & SPCFLAG_STOP) { /* 1 */ + while (regs.spcflags & SPCFLAG_STOP) { do_cycles(); - do_hardware(); - if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT)){ + if (regs.spcflags & SPCFLAG_DISK) + do_disk(); + if (regs.spcflags & (SPCFLAG_INT | SPCFLAG_DOINT | SPCFLAG_TIMER)){ int intr = intlev(); regs.spcflags &= ~(SPCFLAG_INT | SPCFLAG_DOINT); if (intr != -1 && intr > regs.intmask) { @@ -917,14 +1029,15 @@ static __inline__ void m68k_run_1(void) #ifdef WANT_SLOW_MULTIPLY /* Kludge for Hardwired demo. The guys who wrote it should be * mutilated. */ - if (regs.spcflags & SPCFLAG_EXTRA_CYCLES) { /* 5 */ + if (regs.spcflags & SPCFLAG_EXTRA_CYCLES) { do_cycles (); do_cycles (); do_cycles (); do_cycles (); regs.spcflags &= ~SPCFLAG_EXTRA_CYCLES; } #endif - do_hardware(); + if (regs.spcflags & SPCFLAG_DISK) + do_disk(); - if (regs.spcflags & SPCFLAG_DOINT) { /* 8 */ + if (regs.spcflags & (SPCFLAG_DOINT|SPCFLAG_TIMER)) { int intr = intlev(); regs.spcflags &= ~SPCFLAG_DOINT; if (intr != -1 && intr > regs.intmask) { @@ -932,41 +1045,56 @@ static __inline__ void m68k_run_1(void) regs.stopped = 0; } } - if (regs.spcflags & SPCFLAG_INT) { /* 3 */ + if (regs.spcflags & SPCFLAG_INT) { regs.spcflags &= ~SPCFLAG_INT; regs.spcflags |= SPCFLAG_DOINT; } - if (regs.spcflags & SPCFLAG_BRK) { /* 4 */ - regs.spcflags &= ~SPCFLAG_BRK; + if (regs.spcflags & (SPCFLAG_BRK|SPCFLAG_MODE_CHANGE)) { + regs.spcflags &= ~(SPCFLAG_BRK|SPCFLAG_MODE_CHANGE); return; } } } } +#endif #ifdef X86_ASSEMBLY -void m68k_run(void) +static __inline__ void m68k_run1(void) { /* Work around compiler bug: GCC doesn't push %ebp in m68k_run_1. */ __asm__ __volatile__ ("pushl %%ebp\n\tcall *%%eax\n\tpopl %%ebp" : : "a" (m68k_run_1) : "%eax", "%edx", "%ecx", "memory", "cc"); } -#else -void m68k_run(void) +#if USER_PROGRAMS_BEHAVE > 0 +static __inline__ void m68k_run2(void) { - m68k_run_1(); + /* Work around compiler bug: GCC doesn't push %ebp in m68k_run_1. */ + __asm__ __volatile__ ("pushl %%ebp\n\tcall *%%eax\n\tpopl %%ebp" : : "a" (m68k_run_2) : "%eax", "%edx", "%ecx", "memory", "cc"); } #endif +#else +#define m68k_run1 m68k_run_1 +#define m68k_run2 m68k_run_2 +#endif + +int may_run_compiled; void m68k_go(int may_quit) { + int old_mrc = may_run_compiled; + + may_run_compiled = may_quit; for(;;) { if (may_quit && quit_program) return; if (debugging) debug(); - - m68k_run(); - +#if USER_PROGRAMS_BEHAVE > 0 + if ((regs.kick_mask & 0xF00000) != 0xF00000) + m68k_run2(); + else +#endif + m68k_run1(); + /* * We make sure in the above functions that this is never * set together with SPCFLAG_INT and similar flags @@ -978,6 +1106,7 @@ void m68k_go(int may_quit) do_emultrap(lasttrap); } } + may_run_compiled = old_mrc; } void m68k_disasm(CPTR addr, CPTR *nextpc, int cnt) @@ -1018,12 +1147,12 @@ void m68k_disasm(CPTR addr, CPTR *nextpc } if (dp->suse) { - newpc = m68k_getpc() + ShowEA(dp->sreg, dp->smode, dp->size); + newpc = m68k_getpc() + ShowEA(dp->sreg, dp->smode, dp->size, 0); } if (dp->suse && dp->duse) printf(","); if (dp->duse) { - newpc = m68k_getpc() + ShowEA(dp->dreg, dp->dmode, dp->size); + newpc = m68k_getpc() + ShowEA(dp->dreg, dp->dmode, dp->size, 0); } if (ccpt != 0) { if (cctrue(dp->cc)) @@ -1042,16 +1171,16 @@ void m68k_dumpstate(CPTR *nextpc) { int i; for(i = 0; i < 8; i++){ - printf("D%d: %08lx ", i, regs.d[i]); + printf("D%d: %08lx ", i, m68k_dreg(regs, i)); if ((i & 3) == 3) printf("\n"); } for(i = 0; i < 8; i++){ - printf("A%d: %08lx ", i, regs.a[i]); + printf("A%d: %08lx ", i, m68k_areg(regs, i)); if ((i & 3) == 3) printf("\n"); } - if (regs.s == 0) regs.usp = regs.a[7]; - if (regs.s && regs.m) regs.msp = regs.a[7]; - if (regs.s && regs.m == 0) regs.isp = regs.a[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); printf("USP=%08lx ISP=%08lx MSP=%08lx VBR=%08lx\n", regs.usp,regs.isp,regs.msp,regs.vbr); printf ("T=%d%d S=%d M=%d X=%d N=%d Z=%d V=%d C=%d IMASK=%d\n",