--- uae/src/gencpu.c 2018/04/24 16:39:48 1.1.1.3 +++ uae/src/gencpu.c 2018/04/24 16:41:56 1.1.1.5 @@ -38,9 +38,7 @@ static int cpu_level; * are done with that opcode. */ static int next_cpu_level; -char warning_buffer[256]; - -void write_log (const char *s) +void write_log (const char *s, ...) { fprintf (stderr, "%s", s); } @@ -50,18 +48,27 @@ static int *opcode_next_clev; static int *opcode_last_postfix; static unsigned long *counts; -static void read_counts(void) +struct amode_queue +{ + struct amode_queue *next; + char *buf; + unsigned int done:1; +}; + +static struct amode_queue *aq_head; + +static void read_counts (void) { FILE *file; - unsigned long opcode,count, total; + unsigned long opcode, count, total; char name[20]; - int nr = 0, nr2 = 0, r = 0; + int nr = 0; memset (counts, 0, 65536 * sizeof *counts); file = fopen ("frequent.68k", "r"); if (file) { fscanf (file, "Total: %lu\n", &total); - while (fscanf (file,"%lx: %lu %s\n", &opcode, &count, name) == 3) { + while (fscanf (file, "%lx: %lu %s\n", &opcode, &count, name) == 3) { opcode_next_clev[nr] = 3; opcode_last_postfix[nr] = -1; opcode_map[nr++] = opcode; @@ -87,55 +94,55 @@ static void read_counts(void) static char endlabelstr[80]; static int endlabelno = 0; +static int need_endlabel; static int n_braces = 0; static int m68k_pc_offset = 0; +static int insn_n_cycles; -static void start_brace(void) +static void start_brace (void) { n_braces++; printf ("{"); } -static void close_brace(void) +static void close_brace (void) { assert (n_braces > 0); n_braces--; printf ("}"); } -static void finish_braces(void) +static void finish_braces (void) { while (n_braces > 0) - close_brace(); + close_brace (); } -static void pop_braces(int to) +static void pop_braces (int to) { while (n_braces > to) - close_brace(); + close_brace (); } -static int bit_size(int size) +static int bit_size (int size) { - switch(size) { - case sz_byte: return 8; - case sz_word: return 16; - case sz_long: return 32; - default: - abort(); + switch (size) { + case sz_byte: return 8; + case sz_word: return 16; + case sz_long: return 32; + default: abort (); } return 0; } -static const char *bit_mask(int size) +static const char *bit_mask (int size) { - switch(size) { + switch (size) { case sz_byte: return "0xff"; case sz_word: return "0xffff"; case sz_long: return "0xffffffff"; - default: - abort(); + default: abort (); } return 0; } @@ -145,7 +152,13 @@ static const char *gen_nextilong (void) static char buffer[80]; int r = m68k_pc_offset; m68k_pc_offset += 4; - sprintf (buffer, "get_ilong%s(%d)", using_prefetch ? "_prefetch" : "", r); + + insn_n_cycles += 4; + + if (using_prefetch) + sprintf (buffer, "get_ilong_prefetch(%d)", r); + else + sprintf (buffer, "get_ilong(%d)", r); return buffer; } @@ -154,7 +167,13 @@ static const char *gen_nextiword (void) static char buffer[80]; int r = m68k_pc_offset; m68k_pc_offset += 2; - sprintf (buffer, "get_iword%s(%d)", using_prefetch ? "_prefetch" : "", r); + + insn_n_cycles += 2; + + if (using_prefetch) + sprintf (buffer, "get_iword_prefetch(%d)", r); + else + sprintf (buffer, "get_iword(%d)", r); return buffer; } @@ -163,7 +182,13 @@ static const char *gen_nextibyte (void) static char buffer[80]; int r = m68k_pc_offset; m68k_pc_offset += 2; - sprintf (buffer, "get_ibyte%s(%d)", using_prefetch ? "_prefetch" : "", r); + + insn_n_cycles += 2; + + if (using_prefetch) + sprintf (buffer, "get_ibyte_prefetch(%d)", r); + else + sprintf (buffer, "get_ibyte(%d)", r); return buffer; } @@ -179,36 +204,119 @@ static void fill_prefetch_2 (void) printf ("fill_prefetch_2 ();\n"); } +/* To allow the compiler to generate better code, we try to pre-schedule + * the C code we generate to put addressing mode generation code that is + * likely to require many registers earlier than code that is likely to + * use fewer registers. */ + +#define DO_QUEUEING 1 + + +#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 6 +static void queue_amode (const char *, ...) __attribute__ ((format (printf, 1, 2))); +#endif + +static void queue_amode (const char *fmt, ...) +{ + char buf[160]; + struct amode_queue *prev, **aqp; + va_list ap; + va_start (ap, fmt); + +#if DO_QUEUEING +#ifdef HAVE_VSPRINTF + vsprintf (buf, fmt, ap); +#else + { + int x1, x2, x3, x4, x5, x6, x7, x8; + x1 = va_arg (ap, int); + x2 = va_arg (ap, int); + x3 = va_arg (ap, int); + x4 = va_arg (ap, int); + x5 = va_arg (ap, int); + x6 = va_arg (ap, int); + x7 = va_arg (ap, int); + x8 = va_arg (ap, int); + sprintf (buf, fmt, x1, x2, x3, x4, x5, x6, x7, x8); + } +#endif + aqp = &aq_head; + prev = 0; + while (*aqp != 0) + prev = *aqp, aqp = &(*aqp)->next; + if (prev != 0 && ! prev->done) { + char *tmpbuf = prev->buf; + prev->buf = (char *) xmalloc (strlen (tmpbuf) + strlen (buf) + 1); + strcpy (prev->buf, tmpbuf); + strcat (prev->buf, buf); + } else { + struct amode_queue *tmp = (struct amode_queue *) xmalloc (sizeof *tmp); + tmp->next = 0; + tmp->buf = my_strdup (buf); + *aqp = tmp; + } +#else + start_brace (); + vprintf (fmt, ap); +#endif +} + +static void done_queue (void) +{ + struct amode_queue *prev, **aqp; + aqp = &aq_head; + prev = 0; + while (*aqp != 0) + prev = *aqp, aqp = &(*aqp)->next; + if (prev) + prev->done = 1; +} + +static void flush_amodes (void) +{ + while (aq_head != 0) { + struct amode_queue *q = aq_head; + aq_head = q->next; + start_brace (); + printf (q->buf); + free (q->buf); + free (q); + } +} + static void sync_m68k_pc (void) { + flush_amodes (); if (m68k_pc_offset == 0) return; printf ("m68k_incpc(%d);\n", m68k_pc_offset); switch (m68k_pc_offset) { case 0: - /*fprintf (stderr, "refilling prefetch at 0\n");*/ + /*fprintf (stderr, "refilling prefetch at 0\n"); */ break; case 2: - fill_prefetch_2(); + fill_prefetch_2 (); break; default: - fill_prefetch_0(); + fill_prefetch_0 (); break; } m68k_pc_offset = 0; } /* getv == 1: fetch data; getv != 0: check for odd address. If movem != 0, - * the calling routine handles Apdi and Aipi moeds. */ + * the calling routine handles Apdi and Aipi modes. */ static void genamode (amodes mode, char *reg, wordsizes size, char *name, int getv, int movem) { - start_brace (); - switch(mode) { + int queued = 0; + + switch (mode) { case Dreg: if (movem) - abort(); + abort (); + start_brace (); if (getv == 1) - switch(size) { + switch (size) { case sz_byte: #ifdef AMIGA /* sam: I don't know why gcc.2.7.2.1 produces a code worse */ @@ -228,31 +336,37 @@ static void genamode (amodes mode, char case sz_long: printf ("\tuae_s32 %s = m68k_dreg(regs, %s);\n", name, reg); break; - default: abort(); + default: + abort (); } return; case Areg: if (movem) - abort(); + abort (); + start_brace (); if (getv == 1) - switch(size) { + switch (size) { case sz_word: printf ("\tuae_s16 %s = m68k_areg(regs, %s);\n", name, reg); break; case sz_long: printf ("\tuae_s32 %s = m68k_areg(regs, %s);\n", name, reg); break; - default: abort(); + default: + abort (); } return; case Aind: + start_brace (); printf ("\tuaecptr %sa = m68k_areg(regs, %s);\n", name, reg); break; case Aipi: + start_brace (); printf ("\tuaecptr %sa = m68k_areg(regs, %s);\n", name, reg); break; case Apdi: - switch(size) { + start_brace (); + switch (size) { case sz_byte: if (movem) printf ("\tuaecptr %sa = m68k_areg(regs, %s);\n", name, reg); @@ -265,117 +379,126 @@ static void genamode (amodes mode, char case sz_long: printf ("\tuaecptr %sa = m68k_areg(regs, %s) - %d;\n", name, reg, movem ? 0 : 4); break; - default: abort(); + default: + abort (); } break; case Ad16: - printf ("\tuaecptr %sa = m68k_areg(regs, %s) + (uae_s32)(uae_s16)%s;\n", name, reg, gen_nextiword()); + start_brace (); + printf ("\tuaecptr %sa = m68k_areg(regs, %s) + (uae_s32)(uae_s16)%s;\n", name, reg, gen_nextiword ()); break; case Ad8r: if (cpu_level > 1) { if (next_cpu_level < 1) next_cpu_level = 1; - sync_m68k_pc(); - start_brace(); + sync_m68k_pc (); + start_brace (); printf ("\tuaecptr %sa = get_disp_ea_020(m68k_areg(regs, %s), next_iword());\n", name, reg); - } else - printf ("\tuaecptr %sa = get_disp_ea_000(m68k_areg(regs, %s), %s);\n", name, reg, gen_nextiword()); + } else { + start_brace (); + printf ("\tuaecptr %sa = get_disp_ea_000(m68k_areg(regs, %s), %s);\n", name, reg, gen_nextiword ()); + } break; case PC16: - printf ("\tuaecptr %sa = m68k_getpc() + %d;\n", name, m68k_pc_offset); - printf ("\t%sa += (uae_s32)(uae_s16)%s;\n", name, gen_nextiword()); + queue_amode ("\tuaecptr %sa = m68k_getpc () + %d;\n", name, m68k_pc_offset); + queue_amode ("\t%sa += (uae_s32)(uae_s16)%s;\n", name, gen_nextiword ()); + queued = 1; break; case PC8r: if (cpu_level > 1) { if (next_cpu_level < 1) next_cpu_level = 1; - sync_m68k_pc(); - start_brace(); + flush_amodes (); + sync_m68k_pc (); + start_brace (); printf ("\tuaecptr tmppc = m68k_getpc();\n"); printf ("\tuaecptr %sa = get_disp_ea_020(tmppc, next_iword());\n", name); } else { - printf ("\tuaecptr tmppc = m68k_getpc() + %d;\n", m68k_pc_offset); - printf ("\tuaecptr %sa = get_disp_ea_000(tmppc, %s);\n", name, gen_nextiword()); + queue_amode ("\tuaecptr tmppc = m68k_getpc() + %d;\n", m68k_pc_offset); + queue_amode ("\tuaecptr %sa = get_disp_ea_000(tmppc, %s);\n", name, gen_nextiword ()); + queued = 1; } break; case absw: - printf ("\tuaecptr %sa = (uae_s32)(uae_s16)%s;\n", name, gen_nextiword()); + queue_amode ("\tuaecptr %sa = (uae_s32)(uae_s16)%s;\n", name, gen_nextiword ()); + queued = 1; break; case absl: - printf ("\tuaecptr %sa = %s;\n", name, gen_nextilong()); + queue_amode ("\tuaecptr %sa = %s;\n", name, gen_nextilong ()); + queued = 1; break; case imm: if (getv != 1) abort (); - switch(size) { + switch (size) { case sz_byte: - printf ("\tuae_s8 %s = %s;\n", name, gen_nextibyte()); + queue_amode ("\tuae_s8 %s = %s;\n", name, gen_nextibyte ()); break; case sz_word: - printf ("\tuae_s16 %s = %s;\n", name, gen_nextiword()); + queue_amode ("\tuae_s16 %s = %s;\n", name, gen_nextiword ()); break; case sz_long: - printf ("\tuae_s32 %s = %s;\n", name, gen_nextilong()); + queue_amode ("\tuae_s32 %s = %s;\n", name, gen_nextilong ()); break; - default: abort(); + default: + abort (); } return; case imm0: - if (getv != 1) abort(); - printf ("\tuae_s8 %s = %s;\n", name, gen_nextibyte()); + if (getv != 1) + abort (); + queue_amode ("\tuae_s8 %s = %s;\n", name, gen_nextibyte ()); return; case imm1: - if (getv != 1) abort(); - printf ("\tuae_s16 %s = %s;\n", name, gen_nextiword()); + if (getv != 1) + abort (); + queue_amode ("\tuae_s16 %s = %s;\n", name, gen_nextiword ()); return; case imm2: - if (getv != 1) abort(); - printf ("\tuae_s32 %s = %s;\n", name, gen_nextilong()); + if (getv != 1) + abort (); + queue_amode ("\tuae_s32 %s = %s;\n", name, gen_nextilong ()); return; case immi: - if (getv != 1) abort(); + if (getv != 1) + abort (); printf ("\tuae_u32 %s = %s;\n", name, reg); return; default: - abort(); + abort (); } + if (queued) + done_queue (); + /* We get here for all non-reg non-immediate addressing modes to * actually fetch the value. */ if (using_exception_3 && getv != 0 && size != sz_byte) { + if (queued) { + flush_amodes (); + queued = 0; + } + printf ("\tif ((%sa & 1) != 0) {\n", name); printf ("\t\tlast_fault_for_exception_3 = %sa;\n", name); - printf ("\t\tlast_op_for_exception_3 = opcode;\n", name); + printf ("\t\tlast_op_for_exception_3 = opcode;\n"); printf ("\t\tlast_addr_for_exception_3 = m68k_getpc() + %d;\n", m68k_pc_offset); printf ("\t\tException(3, 0);\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t}\n"); - start_brace(); - } - - if (getv == 1) { + need_endlabel = 1; start_brace (); - switch(size) { - case sz_byte: - printf ("\tuae_s8 %s = get_byte(%sa);\n", name, name); - break; - case sz_word: - printf ("\tuae_s16 %s = get_word(%sa);\n", name, name); - break; - case sz_long: - printf ("\tuae_s32 %s = get_long(%sa);\n", name, name); - break; - default: abort(); - } } /* We now might have to fix up the register for pre-dec or post-inc * addressing modes. */ if (!movem) switch (mode) { case Aipi: - switch(size) { + if (queued) + abort (); + switch (size) { case sz_byte: printf ("\tm68k_areg(regs, %s) += areg_byteinc[%s];\n", reg, reg); break; @@ -385,22 +508,49 @@ static void genamode (amodes mode, char case sz_long: printf ("\tm68k_areg(regs, %s) += 4;\n", reg); break; - default: abort(); + default: + abort (); } break; case Apdi: + if (queued) + abort (); printf ("\tm68k_areg (regs, %s) = %sa;\n", reg, name); break; default: break; } + if (getv == 1) { + switch (size) { + case sz_byte: insn_n_cycles += 2; break; + case sz_word: insn_n_cycles += 2; break; + case sz_long: insn_n_cycles += 4; break; + default: abort (); + } + if (queued) + switch (size) { + case sz_byte: queue_amode ("\tuae_s8 %s = get_byte(%sa);\n", name, name); break; + case sz_word: queue_amode ("\tuae_s16 %s = get_word(%sa);\n", name, name); break; + case sz_long: queue_amode ("\tuae_s32 %s = get_long(%sa);\n", name, name); break; + default: abort (); + } + else { + start_brace (); + switch (size) { + case sz_byte: printf ("\tuae_s8 %s = get_byte(%sa);\n", name, name); break; + case sz_word: printf ("\tuae_s16 %s = get_word(%sa);\n", name, name); break; + case sz_long: printf ("\tuae_s32 %s = get_long(%sa);\n", name, name); break; + default: abort (); + } + } + } } static void genastore (char *from, amodes mode, char *reg, wordsizes size, char *to) { - switch(mode) { + switch (mode) { case Dreg: - switch(size) { + switch (size) { case sz_byte: printf ("\tm68k_dreg(regs, %s) = (m68k_dreg(regs, %s) & ~0xff) | ((%s) & 0xff);\n", reg, reg, from); break; @@ -410,11 +560,12 @@ static void genastore (char *from, amode case sz_long: printf ("\tm68k_dreg(regs, %s) = (%s);\n", reg, from); break; - default: abort(); + default: + abort (); } break; case Areg: - switch(size) { + switch (size) { case sz_word: fprintf (stderr, "Foo\n"); printf ("\tm68k_areg(regs, %s) = (uae_s32)(uae_s16)(%s);\n", reg, from); @@ -422,7 +573,8 @@ static void genastore (char *from, amode case sz_long: printf ("\tm68k_areg(regs, %s) = (%s);\n", reg, from); break; - default: abort(); + default: + abort (); } break; case Aind: @@ -432,40 +584,29 @@ static void genastore (char *from, amode case Ad8r: case absw: case absl: - if (using_prefetch) - sync_m68k_pc(); - switch(size) { - case sz_byte: - printf ("\tput_byte(%sa,%s);\n", to, from); - break; - case sz_word: - printf ("\tput_word(%sa,%s);\n", to, from); - break; - case sz_long: - printf ("\tput_long(%sa,%s);\n", to, from); - break; - default: abort(); - } - break; case PC16: case PC8r: if (using_prefetch) - sync_m68k_pc(); - switch(size) { + sync_m68k_pc (); + switch (size) { case sz_byte: + insn_n_cycles += 2; printf ("\tput_byte(%sa,%s);\n", to, from); break; case sz_word: - if (cpu_level < 2) - abort(); + insn_n_cycles += 2; + if (cpu_level < 2 && (mode == PC16 || mode == PC8r)) + abort (); printf ("\tput_word(%sa,%s);\n", to, from); break; case sz_long: - if (cpu_level < 2) - abort(); + insn_n_cycles += 4; + if (cpu_level < 2 && (mode == PC16 || mode == PC8r)) + abort (); printf ("\tput_long(%sa,%s);\n", to, from); break; - default: abort(); + default: + abort (); } break; case imm: @@ -473,66 +614,68 @@ static void genastore (char *from, amode case imm1: case imm2: case immi: - abort(); + abort (); break; default: - abort(); + abort (); } } -static void genmovemel(uae_u16 opcode) +static void genmovemel (uae_u16 opcode) { char getcode[100]; int size = table68k[opcode].size == sz_long ? 4 : 2; if (table68k[opcode].size == sz_long) { - strcpy(getcode, "get_long(srca)"); + strcpy (getcode, "get_long(srca)"); } else { - strcpy(getcode, "(uae_s32)(uae_s16)get_word(srca)"); + strcpy (getcode, "(uae_s32)(uae_s16)get_word(srca)"); } - printf ("\tuae_u16 mask = %s;\n", gen_nextiword()); + printf ("\tuae_u16 mask = %s;\n", gen_nextiword ()); printf ("\tunsigned int dmask = mask & 0xff, amask = (mask >> 8) & 0xff;\n"); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "src", 2, 1); - start_brace(); + flush_amodes (); + start_brace (); printf ("\twhile (dmask) { m68k_dreg(regs, movem_index1[dmask]) = %s; srca += %d; dmask = movem_next[dmask]; }\n", - getcode, size); + getcode, size); printf ("\twhile (amask) { m68k_areg(regs, movem_index1[amask]) = %s; srca += %d; amask = movem_next[amask]; }\n", - getcode, size); + getcode, size); if (table68k[opcode].dmode == Aipi) printf ("\tm68k_areg(regs, dstreg) = srca;\n"); } -static void genmovemle(uae_u16 opcode) +static void genmovemle (uae_u16 opcode) { char putcode[100]; int size = table68k[opcode].size == sz_long ? 4 : 2; if (table68k[opcode].size == sz_long) { - strcpy(putcode, "put_long(srca,"); + strcpy (putcode, "put_long(srca,"); } else { - strcpy(putcode, "put_word(srca,"); + strcpy (putcode, "put_word(srca,"); } - printf ("\tuae_u16 mask = %s;\n", gen_nextiword()); + printf ("\tuae_u16 mask = %s;\n", gen_nextiword ()); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "src", 2, 1); + flush_amodes (); if (using_prefetch) - sync_m68k_pc(); + sync_m68k_pc (); - start_brace(); + start_brace (); if (table68k[opcode].dmode == Apdi) { printf ("\tuae_u16 amask = mask & 0xff, dmask = (mask >> 8) & 0xff;\n"); printf ("\twhile (amask) { srca -= %d; %s m68k_areg(regs, movem_index2[amask])); amask = movem_next[amask]; }\n", - size, putcode); + size, putcode); printf ("\twhile (dmask) { srca -= %d; %s m68k_dreg(regs, movem_index2[dmask])); dmask = movem_next[dmask]; }\n", - size, putcode); + size, putcode); printf ("\tm68k_areg(regs, dstreg) = srca;\n"); } else { printf ("\tuae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff;\n"); printf ("\twhile (dmask) { %s m68k_dreg(regs, movem_index1[dmask])); srca += %d; dmask = movem_next[dmask]; }\n", - putcode, size); + putcode, size); printf ("\twhile (amask) { %s m68k_areg(regs, movem_index1[amask])); srca += %d; amask = movem_next[amask]; }\n", - putcode, size); + putcode, size); } } @@ -541,45 +684,52 @@ typedef enum { flag_av, flag_sv } flagtypes; -static void genflags_normal(flagtypes type, wordsizes size, char *value, char *src, char *dst) +static void genflags_normal (flagtypes type, wordsizes size, char *value, char *src, char *dst) { - char vstr[100],sstr[100],dstr[100]; - char usstr[100],udstr[100]; - char unsstr[100],undstr[100]; + char vstr[100], sstr[100], dstr[100]; + char usstr[100], udstr[100]; + char unsstr[100], undstr[100]; - switch(size) { + switch (size) { case sz_byte: - strcpy(vstr, "((uae_s8)("); - strcpy(usstr, "((uae_u8)("); + strcpy (vstr, "((uae_s8)("); + strcpy (usstr, "((uae_u8)("); break; case sz_word: - strcpy(vstr, "((uae_s16)("); - strcpy(usstr, "((uae_u16)("); + strcpy (vstr, "((uae_s16)("); + strcpy (usstr, "((uae_u16)("); break; case sz_long: - strcpy(vstr, "((uae_s32)("); - strcpy(usstr, "((uae_u32)("); + strcpy (vstr, "((uae_s32)("); + strcpy (usstr, "((uae_u32)("); break; default: - abort(); + abort (); } - strcpy(unsstr, usstr); + strcpy (unsstr, usstr); - strcpy(sstr, vstr); - strcpy(dstr, vstr); - strcat(vstr, value); strcat(vstr,"))"); - strcat(dstr, dst); strcat(dstr,"))"); - strcat(sstr, src); strcat(sstr,"))"); - - strcpy(udstr, usstr); - strcat(udstr, dst); strcat(udstr,"))"); - strcat(usstr, src); strcat(usstr,"))"); - - strcpy(undstr, unsstr); - strcat(unsstr, "-"); - strcat(undstr, "~"); - strcat(undstr, dst); strcat(undstr,"))"); - strcat(unsstr, src); strcat(unsstr,"))"); + strcpy (sstr, vstr); + strcpy (dstr, vstr); + strcat (vstr, value); + strcat (vstr, "))"); + strcat (dstr, dst); + strcat (dstr, "))"); + strcat (sstr, src); + strcat (sstr, "))"); + + strcpy (udstr, usstr); + strcat (udstr, dst); + strcat (udstr, "))"); + strcat (usstr, src); + strcat (usstr, "))"); + + strcpy (undstr, unsstr); + strcat (unsstr, "-"); + strcat (undstr, "~"); + strcat (undstr, dst); + strcat (undstr, "))"); + strcat (unsstr, src); + strcat (unsstr, "))"); switch (type) { case flag_logical: @@ -591,12 +741,12 @@ static void genflags_normal(flagtypes ty break; case flag_add: - start_brace(); + start_brace (); printf ("uae_u32 %s = %s + %s;\n", value, dstr, sstr); break; case flag_sub: case flag_cmp: - start_brace(); + start_brace (); printf ("uae_u32 %s = %s - %s;\n", value, dstr, sstr); break; } @@ -614,24 +764,24 @@ static void genflags_normal(flagtypes ty case flag_cmp: case flag_av: case flag_sv: - start_brace(); - printf ("\t"BOOL_TYPE" flgs = %s < 0;\n", sstr); - printf ("\t"BOOL_TYPE" flgo = %s < 0;\n", dstr); - printf ("\t"BOOL_TYPE" flgn = %s < 0;\n", vstr); + start_brace (); + printf ("\t" BOOL_TYPE " flgs = %s < 0;\n", sstr); + printf ("\t" BOOL_TYPE " flgo = %s < 0;\n", dstr); + printf ("\t" BOOL_TYPE " flgn = %s < 0;\n", vstr); break; } - switch(type) { + switch (type) { case flag_logical: printf ("\tVFLG = CFLG = 0;\n"); printf ("\tZFLG = %s == 0;\n", vstr); printf ("\tNFLG = %s < 0;\n", vstr); break; case flag_av: - printf ("\tVFLG = (flgs == flgo) && (flgn != flgo);\n"); + printf ("\tVFLG = (flgs ^ flgn) & (flgo ^ flgn);\n"); break; case flag_sv: - printf ("\tVFLG = (flgs != flgo) && (flgn != flgo);\n"); + printf ("\tVFLG = (flgs ^ flgo) & (flgn ^ flgo);\n"); break; case flag_zn: printf ("\tif (%s != 0) ZFLG = 0;\n", vstr); @@ -639,23 +789,33 @@ static void genflags_normal(flagtypes ty break; case flag_add: printf ("\tZFLG = %s == 0;\n", vstr); - printf ("\tVFLG = (flgs == flgo) && (flgn != flgo);\n"); + printf ("\tVFLG = (flgs ^ flgn) & (flgo ^ flgn);\n"); printf ("\tCFLG = XFLG = %s < %s;\n", undstr, usstr); printf ("\tNFLG = flgn != 0;\n"); break; case flag_sub: printf ("\tZFLG = %s == 0;\n", vstr); - printf ("\tVFLG = (flgs != flgo) && (flgn != flgo);\n"); + printf ("\tVFLG = (flgs ^ flgo) & (flgn ^ flgo);\n"); printf ("\tCFLG = XFLG = %s > %s;\n", usstr, udstr); printf ("\tNFLG = flgn != 0;\n"); break; case flag_addx: - printf ("\tVFLG = (flgs && flgo && !flgn) || (!flgs && !flgo && flgn);\n"); - printf ("\tXFLG = CFLG = (flgs && flgo) || (!flgn && (flgo || flgs));\n"); +#if 0 + printf ("\tVFLG = (flgs && flgo && !flgn) || (!flgs && !flgo && flgn);\n"); /* minterm SON: 0x42 */ + printf ("\tXFLG = CFLG = (flgs && flgo) || (!flgn && (flgo || flgs));\n"); /* minterm SON: 0xD4 */ +#else + printf ("\tVFLG = (flgs ^ flgn) & (flgo ^ flgn);\n"); /* minterm SON: 0x42 */ + printf ("\tXFLG = CFLG = flgs ^ ((flgs ^ flgo) & (flgo ^ flgn));\n"); /* minterm SON: 0xD4 */ +#endif break; case flag_subx: - printf ("\tVFLG = (!flgs && flgo && !flgn) || (flgs && !flgo && flgn);\n"); - printf ("\tXFLG = CFLG = (flgs && !flgo) || (flgn && (!flgo || flgs));\n"); +#if 0 + printf ("\tVFLG = (!flgs && flgo && !flgn) || (flgs && !flgo && flgn);\n"); /* minterm SON: 0x24 */ + printf ("\tXFLG = CFLG = (flgs && !flgo) || (flgn && (!flgo || flgs));\n"); /* minterm SON: 0xB2 */ +#else + printf ("\tVFLG = (flgs ^ flgo) & (flgo ^ flgn);\n"); /* minterm SON: 0x24 */ + printf ("\tXFLG = CFLG = flgs ^ ((flgs ^ flgn) & (flgo ^ flgn));\n"); /* minterm SON: 0xB2 */ +#endif break; case flag_cmp: printf ("\tZFLG = %s == 0;\n", vstr); @@ -666,14 +826,15 @@ static void genflags_normal(flagtypes ty } } -static void genflags(flagtypes type, wordsizes size, char *value, char *src, char *dst) +static void genflags (flagtypes type, wordsizes size, char *value, char *src, char *dst) { #ifdef X86_ASSEMBLY - start_brace(); + start_brace (); printf ("\tuae_u32 scratch;\n"); switch (type) { - case flag_add: case flag_sub: - start_brace(); + case flag_add: + case flag_sub: + start_brace (); printf ("\tuae_u32 %s;\n", value); break; @@ -682,12 +843,12 @@ static void genflags(flagtypes type, wor } /* At least some of those casts are fairly important! */ - switch(type) { + switch (type) { case flag_logical: - if (strcmp(value, "0") == 0) { + if (strcmp (value, "0") == 0) { printf ("\t*(uae_u32 *)®flags = 64;\n"); } else { - switch(size) { + switch (size) { case sz_byte: printf ("\tx86_flag_testb ((uae_s8)(%s));\n", value); break; case sz_word: printf ("\tx86_flag_testw ((uae_s16)(%s));\n", value); break; case sz_long: printf ("\tx86_flag_testl ((uae_s32)(%s));\n", value); break; @@ -696,7 +857,7 @@ static void genflags(flagtypes type, wor return; case flag_add: - switch(size) { + switch (size) { case sz_byte: printf ("\tx86_flag_addb (%s, (uae_s8)(%s), (uae_s8)(%s));\n", value, src, dst); break; case sz_word: printf ("\tx86_flag_addw (%s, (uae_s16)(%s), (uae_s16)(%s));\n", value, src, dst); break; case sz_long: printf ("\tx86_flag_addl (%s, (uae_s32)(%s), (uae_s32)(%s));\n", value, src, dst); break; @@ -704,7 +865,7 @@ static void genflags(flagtypes type, wor return; case flag_sub: - switch(size) { + switch (size) { case sz_byte: printf ("\tx86_flag_subb (%s, (uae_s8)(%s), (uae_s8)(%s));\n", value, src, dst); break; case sz_word: printf ("\tx86_flag_subw (%s, (uae_s16)(%s), (uae_s16)(%s));\n", value, src, dst); break; case sz_long: printf ("\tx86_flag_subl (%s, (uae_s32)(%s), (uae_s32)(%s));\n", value, src, dst); break; @@ -712,13 +873,13 @@ static void genflags(flagtypes type, wor return; case flag_cmp: - switch(size) { + switch (size) { case sz_byte: printf ("\tx86_flag_cmpb ((uae_s8)(%s), (uae_s8)(%s));\n", src, dst); break; case sz_word: printf ("\tx86_flag_cmpw ((uae_s16)(%s), (uae_s16)(%s));\n", src, dst); break; case sz_long: printf ("\tx86_flag_cmpl ((uae_s32)(%s), (uae_s32)(%s));\n", src, dst); break; } return; - + default: break; } @@ -727,8 +888,9 @@ static void genflags(flagtypes type, wor #define EXT(size) (size==sz_byte?"b":(size==sz_word?"w":"l")) #define CAST(size) (size==sz_byte?"uae_s8":(size==sz_word?"uae_s16":"uae_s32")) switch (type) { - case flag_add: case flag_sub: - start_brace(); + case flag_add: + case flag_sub: + start_brace (); printf ("\tuae_u32 %s;\n", value); break; @@ -736,33 +898,33 @@ static void genflags(flagtypes type, wor break; } - switch(type) { + switch (type) { case flag_logical: - if (strcmp(value, "0") == 0) { - printf ("\t*(uae_u16 *)®flags = 4;\n"); /* Z = 1 */ + if (strcmp (value, "0") == 0) { + printf ("\t*(uae_u16 *)®flags = 4;\n"); /* Z = 1 */ } else { - printf ("\tm68k_flag_tst (%s, (%s)(%s));\n", - EXT(size), CAST(size), value); + printf ("\tm68k_flag_tst (%s, (%s)(%s));\n", + EXT (size), CAST (size), value); } return; case flag_add: printf ("\t{uae_u16 ccr;\n"); - printf ("\tm68k_flag_add (%s, (%s)%s, (%s)(%s), (%s)(%s));\n", - EXT(size), CAST(size), value, CAST(size), src, CAST(size), dst); + printf ("\tm68k_flag_add (%s, (%s)%s, (%s)(%s), (%s)(%s));\n", + EXT (size), CAST (size), value, CAST (size), src, CAST (size), dst); printf ("\t((uae_u16*)®flags)[1]=((uae_u16*)®flags)[0]=ccr;}\n"); return; case flag_sub: printf ("\t{uae_u16 ccr;\n"); - printf ("\tm68k_flag_sub (%s, (%s)%s, (%s)(%s), (%s)(%s));\n", - EXT(size), CAST(size), value, CAST(size), src, CAST(size), dst); + printf ("\tm68k_flag_sub (%s, (%s)%s, (%s)(%s), (%s)(%s));\n", + EXT (size), CAST (size), value, CAST (size), src, CAST (size), dst); printf ("\t((uae_u16*)®flags)[1]=((uae_u16*)®flags)[0]=ccr;}\n"); return; case flag_cmp: - printf ("\tm68k_flag_cmp (%s, (%s)(%s), (%s)(%s));\n", - EXT(size), CAST(size), src, CAST(size), dst); + printf ("\tm68k_flag_cmp (%s, (%s)(%s), (%s)(%s));\n", + EXT (size), CAST (size), src, CAST (size), dst); return; default: @@ -772,150 +934,137 @@ static void genflags(flagtypes type, wor /* * This is new. Might be quite buggy. */ - switch (type) - { - case flag_av: - case flag_sv: - case flag_zn: - case flag_addx: - case flag_subx: - break; - - case flag_logical: - if (strcmp(value, "0") == 0) { - /* v=c=n=0 z=1 */ - printf ("\t*(ULONG*)®flags = 0x40000000;\n"); - return; - } - else - { - start_brace(); - switch(size) - { - case sz_byte: - printf ("\tUBYTE ccr;\n"); - printf ("\tULONG shift;\n"); - printf ("\t__asm__(\"mov %%2,%%1,lsl#24\n\ttst %%2,%%2\n\tmov %%0,r15,lsr#24\n\tbic %%0,%%0,#0x30\"\n" - "\t: \"=r\" (ccr) : \"r\" (%s), \"r\" (shift) : \"cc\" );\n", value); - printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); - return; - case sz_word: - printf ("\tUBYTE ccr;\n"); - printf ("\tULONG shift;\n"); - printf ("\t__asm__(\"mov %%2,%%1,lsl#16\n\ttst %%2,%%2\n\tmov %%0,r15,lsr#24\n\tbic %%0,%%0,#0x30\"\n" - "\t: \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", value); - printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); - return; - case sz_long: - printf ("\tUBYTE ccr;\n"); - printf ("\t__asm__(\"tst %%1,%%1\n\tmov %%0,r15,lsr#24\n\tbic %%0,%%0,#0x30\"\n" - "\t: \"=r\" (ccr) : \"r\" ((LONG)%s) : \"cc\" );\n", value); - printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); + switch (type) { + case flag_av: + case flag_sv: + case flag_zn: + case flag_addx: + case flag_subx: + break; + + case flag_logical: + if (strcmp (value, "0") == 0) { + /* v=c=n=0 z=1 */ + printf ("\t*(ULONG*)®flags = 0x40000000;\n"); return; + } else { + start_brace (); + switch (size) { + case sz_byte: + printf ("\tUBYTE ccr;\n"); + printf ("\tULONG shift;\n"); + printf ("\t__asm__(\"mov %%2,%%1,lsl#24\n\ttst %%2,%%2\n\tmov %%0,r15,lsr#24\n\tbic %%0,%%0,#0x30\"\n" + "\t: \"=r\" (ccr) : \"r\" (%s), \"r\" (shift) : \"cc\" );\n", value); + printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); + return; + case sz_word: + printf ("\tUBYTE ccr;\n"); + printf ("\tULONG shift;\n"); + printf ("\t__asm__(\"mov %%2,%%1,lsl#16\n\ttst %%2,%%2\n\tmov %%0,r15,lsr#24\n\tbic %%0,%%0,#0x30\"\n" + "\t: \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", value); + printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); + return; + case sz_long: + printf ("\tUBYTE ccr;\n"); + printf ("\t__asm__(\"tst %%1,%%1\n\tmov %%0,r15,lsr#24\n\tbic %%0,%%0,#0x30\"\n" + "\t: \"=r\" (ccr) : \"r\" ((LONG)%s) : \"cc\" );\n", value); + printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); + return; + } } - } - break; - case flag_add: - if(strcmp(dst,"0")==0) - { - printf ("/* Error! Hier muss Peter noch was machen !!! (ADD-Flags) */"); - } - else - { - start_brace(); - switch (size) - { - case sz_byte: - printf ("\tULONG ccr, shift, %s;\n", value); - printf ("\t__asm__(\"mov %%4,%%3,lsl#24\n\tadds %%0,%%4,%%2,lsl#24\n\tmov %%0,%%0,asr#24\n\tmov %%1,r15\n\torr %%1,%%1,%%1,lsr#29\"\n" - "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" (%s), \"r\" (%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); - printf ("\t*(ULONG*)®flags = ccr;\n"); - return; - case sz_word: - printf ("\tULONG ccr, shift, %s;\n", value); - printf ("\t__asm__(\"mov %%4,%%3,lsl#16\n\tadds %%0,%%4,%%2,lsl#16\n\tmov %%0,%%0,asr#16\n\tmov %%1,r15\n\torr %%1,%%1,%%1,lsr#29\"\n" - "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); - printf ("\t*(ULONG*)®flags = ccr;\n"); - return; - case sz_long: - printf ("\tULONG ccr, %s;\n", value); - printf ("\t__asm__(\"adds %%0,%%3,%%2\n\tmov %%1,r15\n\torr %%1,%%1,%%1,lsr#29\"\n" - "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((LONG)%s), \"r\" ((LONG)%s) : \"cc\" );\n", value, src, dst); - printf ("\t*(ULONG*)®flags = ccr;\n"); - return; + break; + case flag_add: + if (strcmp (dst, "0") == 0) { + printf ("/* Error! Hier muss Peter noch was machen !!! (ADD-Flags) */"); + } else { + start_brace (); + switch (size) { + case sz_byte: + printf ("\tULONG ccr, shift, %s;\n", value); + printf ("\t__asm__(\"mov %%4,%%3,lsl#24\n\tadds %%0,%%4,%%2,lsl#24\n\tmov %%0,%%0,asr#24\n\tmov %%1,r15\n\torr %%1,%%1,%%1,lsr#29\"\n" + "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" (%s), \"r\" (%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); + printf ("\t*(ULONG*)®flags = ccr;\n"); + return; + case sz_word: + printf ("\tULONG ccr, shift, %s;\n", value); + printf ("\t__asm__(\"mov %%4,%%3,lsl#16\n\tadds %%0,%%4,%%2,lsl#16\n\tmov %%0,%%0,asr#16\n\tmov %%1,r15\n\torr %%1,%%1,%%1,lsr#29\"\n" + "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); + printf ("\t*(ULONG*)®flags = ccr;\n"); + return; + case sz_long: + printf ("\tULONG ccr, %s;\n", value); + printf ("\t__asm__(\"adds %%0,%%3,%%2\n\tmov %%1,r15\n\torr %%1,%%1,%%1,lsr#29\"\n" + "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((LONG)%s), \"r\" ((LONG)%s) : \"cc\" );\n", value, src, dst); + printf ("\t*(ULONG*)®flags = ccr;\n"); + return; + } } - } - break; - case flag_sub: - if(strcmp(dst,"0")==0) - { - printf ("/* Error! Hier muss Peter noch was machen !!! (SUB-Flags) */"); - } - else - { - start_brace(); - switch (size) - { - case sz_byte: - printf ("\tULONG ccr, shift, %s;\n", value); - printf ("\t__asm__(\"mov %%4,%%3,lsl#24\n\tsubs %%0,%%4,%%2,lsl#24\n\tmov %%0,%%0,asr#24\n\tmov %%1,r15\n\teor %%1,%%1,#0x20000000\n\torr %%1,%%1,%%1,lsr#29\"\n" - "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" (%s), \"r\" (%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); - printf ("\t*(ULONG*)®flags = ccr;\n"); - return; - case sz_word: - printf ("\tULONG ccr, shift, %s;\n", value); - printf ("\t__asm__(\"mov %%4,%%3,lsl#16\n\tsubs %%0,%%4,%%2,lsl#16\n\tmov %%0,%%0,asr#16\n\tmov %%1,r15\n\teor %%1,%%1,#0x20000000\n\torr %%1,%%1,%%1,lsr#29\"\n" - "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); - printf ("\t*(ULONG*)®flags = ccr;\n"); - return; - case sz_long: - printf ("\tULONG ccr, %s;\n", value); - printf ("\t__asm__(\"subs %%0,%%3,%%2\n\tmov %%1,r15\n\teor %%1,%%1,#0x20000000\n\torr %%1,%%1,%%1,lsr#29\"\n" - "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((LONG)%s), \"r\" ((LONG)%s) : \"cc\" );\n", value, src, dst); - printf ("\t*(ULONG*)®flags = ccr;\n"); - return; + break; + case flag_sub: + if (strcmp (dst, "0") == 0) { + printf ("/* Error! Hier muss Peter noch was machen !!! (SUB-Flags) */"); + } else { + start_brace (); + switch (size) { + case sz_byte: + printf ("\tULONG ccr, shift, %s;\n", value); + printf ("\t__asm__(\"mov %%4,%%3,lsl#24\n\tsubs %%0,%%4,%%2,lsl#24\n\tmov %%0,%%0,asr#24\n\tmov %%1,r15\n\teor %%1,%%1,#0x20000000\n\torr %%1,%%1,%%1,lsr#29\"\n" + "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" (%s), \"r\" (%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); + printf ("\t*(ULONG*)®flags = ccr;\n"); + return; + case sz_word: + printf ("\tULONG ccr, shift, %s;\n", value); + printf ("\t__asm__(\"mov %%4,%%3,lsl#16\n\tsubs %%0,%%4,%%2,lsl#16\n\tmov %%0,%%0,asr#16\n\tmov %%1,r15\n\teor %%1,%%1,#0x20000000\n\torr %%1,%%1,%%1,lsr#29\"\n" + "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", value, src, dst); + printf ("\t*(ULONG*)®flags = ccr;\n"); + return; + case sz_long: + printf ("\tULONG ccr, %s;\n", value); + printf ("\t__asm__(\"subs %%0,%%3,%%2\n\tmov %%1,r15\n\teor %%1,%%1,#0x20000000\n\torr %%1,%%1,%%1,lsr#29\"\n" + "\t: \"=r\" (%s), \"=r\" (ccr) : \"r\" ((LONG)%s), \"r\" ((LONG)%s) : \"cc\" );\n", value, src, dst); + printf ("\t*(ULONG*)®flags = ccr;\n"); + return; + } } - } - break; - case flag_cmp: - if(strcmp(dst,"0")==0) - { - printf ("/*Error! Hier muss Peter noch was machen !!! (CMP-Flags)*/"); - } - else - { - start_brace(); - switch (size) - { - case sz_byte: - printf ("\tULONG shift, ccr;\n"); - printf ("\t__asm__(\"mov %%3,%%2,lsl#24\n\tcmp %%3,%%1,lsl#24\n\tmov %%0,r15,lsr#24\n\teor %%0,%%0,#0x20\"\n" - "\t: \"=r\" (ccr) : \"r\" (%s), \"r\" (%s), \"r\" (shift) : \"cc\" );\n", src, dst); - printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); - return; - case sz_word: - printf ("\tULONG shift, ccr;\n"); - printf ("\t__asm__(\"mov %%3,%%2,lsl#16\n\tcmp %%3,%%1,lsl#16\n\tmov %%0,r15,lsr#24\n\teor %%0,%%0,#0x20\"\n" - "\t: \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", src, dst); - printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); - return; - case sz_long: - printf ("\tULONG ccr;\n"); - printf ("\t__asm__(\"cmp %%2,%%1\n\tmov %%0,r15,lsr#24\n\teor %%0,%%0,#0x20\"\n" - "\t: \"=r\" (ccr) : \"r\" ((LONG)%s), \"r\" ((LONG)%s) : \"cc\" );\n", src, dst); - printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); - /*printf ("\tprintf (\"%%08x %%08x %%08x\\n\", %s, %s, *((ULONG*)®flags));\n", src, dst);*/ - return; - } - } - break; - } + break; + case flag_cmp: + if (strcmp (dst, "0") == 0) { + printf ("/*Error! Hier muss Peter noch was machen !!! (CMP-Flags)*/"); + } else { + start_brace (); + switch (size) { + case sz_byte: + printf ("\tULONG shift, ccr;\n"); + printf ("\t__asm__(\"mov %%3,%%2,lsl#24\n\tcmp %%3,%%1,lsl#24\n\tmov %%0,r15,lsr#24\n\teor %%0,%%0,#0x20\"\n" + "\t: \"=r\" (ccr) : \"r\" (%s), \"r\" (%s), \"r\" (shift) : \"cc\" );\n", src, dst); + printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); + return; + case sz_word: + printf ("\tULONG shift, ccr;\n"); + printf ("\t__asm__(\"mov %%3,%%2,lsl#16\n\tcmp %%3,%%1,lsl#16\n\tmov %%0,r15,lsr#24\n\teor %%0,%%0,#0x20\"\n" + "\t: \"=r\" (ccr) : \"r\" ((WORD)%s), \"r\" ((WORD)%s), \"r\" (shift) : \"cc\" );\n", src, dst); + printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); + return; + case sz_long: + printf ("\tULONG ccr;\n"); + printf ("\t__asm__(\"cmp %%2,%%1\n\tmov %%0,r15,lsr#24\n\teor %%0,%%0,#0x20\"\n" + "\t: \"=r\" (ccr) : \"r\" ((LONG)%s), \"r\" ((LONG)%s) : \"cc\" );\n", src, dst); + printf ("\t*((UBYTE*)®flags+3) = ccr;\n"); + /*printf ("\tprintf (\"%%08x %%08x %%08x\\n\", %s, %s, *((ULONG*)®flags));\n", src, dst); */ + return; + } + } + break; + } #endif - genflags_normal(type, size, value, src, dst); + genflags_normal (type, size, value, src, dst); } -static void gen_opcode(unsigned long int opcode) +static void gen_opcode (unsigned long int opcode) { + aq_head = 0; + insn_n_cycles = 2; + start_brace (); #if 0 printf ("uae_u8 *m68k_pc = regs.pc_p;\n"); @@ -930,43 +1079,49 @@ static void gen_opcode(unsigned long int if (next_cpu_level < 0) next_cpu_level = 0; - /* FALLTHROUGH */ + /* fall through */ case 2: /* priviledged */ printf ("if (!regs.s) { Exception(8,0); goto %s; }\n", endlabelstr); - start_brace(); + need_endlabel = 1; + start_brace (); break; case 3: /* privileged if size == word */ if (table68k[opcode].size == sz_byte) break; printf ("if (!regs.s) { Exception(8,0); goto %s; }\n", endlabelstr); - start_brace(); + need_endlabel = 1; + start_brace (); break; } - switch(table68k[opcode].mnemo) { + switch (table68k[opcode].mnemo) { case i_OR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); printf ("\tsrc |= dst;\n"); - genflags(flag_logical, table68k[opcode].size, "src", "", ""); + genflags (flag_logical, table68k[opcode].size, "src", "", ""); genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_AND: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); printf ("\tsrc &= dst;\n"); - genflags(flag_logical, table68k[opcode].size, "src", "", ""); + genflags (flag_logical, table68k[opcode].size, "src", "", ""); genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_EOR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); printf ("\tsrc ^= dst;\n"); - genflags(flag_logical, table68k[opcode].size, "src", "", ""); + genflags (flag_logical, table68k[opcode].size, "src", "", ""); genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_ORSR: printf ("\tMakeSR();\n"); genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) { printf ("\tsrc &= 0xFF;\n"); } @@ -976,6 +1131,7 @@ static void gen_opcode(unsigned long int case i_ANDSR: printf ("\tMakeSR();\n"); genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) { printf ("\tsrc |= 0xFF00;\n"); } @@ -985,6 +1141,7 @@ static void gen_opcode(unsigned long int case i_EORSR: printf ("\tMakeSR();\n"); genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) { printf ("\tsrc &= 0xFF;\n"); } @@ -994,13 +1151,15 @@ static void gen_opcode(unsigned long int case i_SUB: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); start_brace (); - genflags(flag_sub, table68k[opcode].size, "newv", "src", "dst"); + genflags (flag_sub, table68k[opcode].size, "newv", "src", "dst"); genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_SUBA: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 newv = dst - src;\n"); genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst"); @@ -1008,16 +1167,18 @@ static void gen_opcode(unsigned long int case i_SUBX: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 newv = dst - src - (XFLG ? 1 : 0);\n"); - genflags(flag_subx, table68k[opcode].size, "newv", "src", "dst"); - genflags(flag_zn, table68k[opcode].size, "newv", "", ""); + genflags (flag_subx, table68k[opcode].size, "newv", "src", "dst"); + genflags (flag_zn, table68k[opcode].size, "newv", "", ""); genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_SBCD: /* Let's hope this works... */ genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u16 newv_lo = (dst & 0xF) - (src & 0xF) - (XFLG ? 1 : 0);\n"); printf ("\tuae_u16 newv_hi = (dst & 0xF0) - (src & 0xF0);\n"); @@ -1026,20 +1187,22 @@ static void gen_opcode(unsigned long int printf ("\tnewv = newv_hi + (newv_lo & 0xF);"); printf ("\tCFLG = XFLG = (newv_hi & 0x1F0) > 0x90;\n"); printf ("\tif (CFLG) newv -= 0x60;\n"); - genflags(flag_zn, table68k[opcode].size, "newv", "", ""); - genflags(flag_sv, table68k[opcode].size, "newv", "src", "dst"); + genflags (flag_zn, table68k[opcode].size, "newv", "", ""); + genflags (flag_sv, table68k[opcode].size, "newv", "src", "dst"); genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_ADD: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); start_brace (); - genflags(flag_add, table68k[opcode].size, "newv", "src", "dst"); + genflags (flag_add, table68k[opcode].size, "newv", "src", "dst"); genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_ADDA: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 newv = dst + src;\n"); genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst"); @@ -1047,15 +1210,17 @@ static void gen_opcode(unsigned long int case i_ADDX: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 newv = dst + src + (XFLG ? 1 : 0);\n"); - genflags(flag_addx, table68k[opcode].size, "newv", "src", "dst"); - genflags(flag_zn, table68k[opcode].size, "newv", "", ""); + genflags (flag_addx, table68k[opcode].size, "newv", "src", "dst"); + genflags (flag_zn, table68k[opcode].size, "newv", "", ""); genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_ABCD: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u16 newv_lo = (src & 0xF) + (dst & 0xF) + (XFLG ? 1 : 0);\n"); printf ("\tuae_u16 newv_hi = (src & 0xF0) + (dst & 0xF0);\n"); @@ -1064,26 +1229,29 @@ static void gen_opcode(unsigned long int printf ("\tnewv = newv_hi + newv_lo;"); printf ("\tCFLG = XFLG = (newv & 0x1F0) > 0x90;\n"); printf ("\tif (CFLG) newv += 0x60;\n"); - genflags(flag_zn, table68k[opcode].size, "newv", "", ""); - genflags(flag_sv, table68k[opcode].size, "newv", "src", "dst"); + genflags (flag_zn, table68k[opcode].size, "newv", "", ""); + genflags (flag_sv, table68k[opcode].size, "newv", "src", "dst"); genastore ("newv", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_NEG: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); start_brace (); - genflags(flag_sub, table68k[opcode].size, "dst", "src", "0"); - genastore ("dst",table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); + genflags (flag_sub, table68k[opcode].size, "dst", "src", "0"); + genastore ("dst", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_NEGX: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 newv = 0 - src - (XFLG ? 1 : 0);\n"); - genflags(flag_subx, table68k[opcode].size, "newv", "src", "0"); - genflags(flag_zn, table68k[opcode].size, "newv", "", ""); + genflags (flag_subx, table68k[opcode].size, "newv", "src", "0"); + genflags (flag_zn, table68k[opcode].size, "newv", "", ""); genastore ("newv", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_NBCD: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u16 newv_lo = - (src & 0xF) - (XFLG ? 1 : 0);\n"); printf ("\tuae_u16 newv_hi = - (src & 0xF0);\n"); @@ -1092,28 +1260,32 @@ static void gen_opcode(unsigned long int printf ("\tnewv = newv_hi + (newv_lo & 0xF);"); printf ("\tCFLG = XFLG = (newv_hi & 0x1F0) > 0x90;\n"); printf ("\tif (CFLG) newv -= 0x60;\n"); - genflags(flag_zn, table68k[opcode].size, "newv", "", ""); + genflags (flag_zn, table68k[opcode].size, "newv", "", ""); genastore ("newv", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_CLR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 2, 0); - genflags(flag_logical, table68k[opcode].size, "0", "", ""); - genastore ("0",table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); + flush_amodes (); + genflags (flag_logical, table68k[opcode].size, "0", "", ""); + genastore ("0", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_NOT: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 dst = ~src;\n"); - genflags(flag_logical, table68k[opcode].size, "dst", "", ""); - genastore ("dst",table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); + genflags (flag_logical, table68k[opcode].size, "dst", "", ""); + genastore ("dst", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_TST: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); - genflags(flag_logical, table68k[opcode].size, "src", "", ""); + flush_amodes (); + genflags (flag_logical, table68k[opcode].size, "src", "", ""); break; case i_BTST: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1123,6 +1295,7 @@ static void gen_opcode(unsigned long int case i_BCHG: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1134,6 +1307,7 @@ static void gen_opcode(unsigned long int case i_BCLR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1145,6 +1319,7 @@ static void gen_opcode(unsigned long int case i_BSET: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1157,20 +1332,24 @@ static void gen_opcode(unsigned long int case i_CMP: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); start_brace (); - genflags(flag_cmp, table68k[opcode].size, "newv", "src", "dst"); + genflags (flag_cmp, table68k[opcode].size, "newv", "src", "dst"); break; case i_CMPA: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0); + flush_amodes (); start_brace (); - genflags(flag_cmp, sz_long, "newv", "src", "dst"); + genflags (flag_cmp, sz_long, "newv", "src", "dst"); break; /* The next two are coded a little unconventional, but they are doing * weird things... */ case i_MVPRM: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); - printf ("\tuaecptr memp = m68k_areg(regs, dstreg) + %s;\n", gen_nextiword()); + flush_amodes (); + + printf ("\tuaecptr memp = m68k_areg(regs, dstreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword ()); if (table68k[opcode].size == sz_word) { printf ("\tput_byte(memp, src >> 8); put_byte(memp + 2, src);\n"); } else { @@ -1179,8 +1358,9 @@ static void gen_opcode(unsigned long int } break; case i_MVPMR: - printf ("\tuaecptr memp = m68k_areg(regs, srcreg) + %s;\n", gen_nextiword()); + printf ("\tuaecptr memp = m68k_areg(regs, srcreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword ()); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0); + flush_amodes (); if (table68k[opcode].size == sz_word) { printf ("\tuae_u16 val = (get_byte(memp) << 8) + get_byte(memp + 2);\n"); } else { @@ -1192,12 +1372,14 @@ static void gen_opcode(unsigned long int case i_MOVE: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0); - genflags(flag_logical, table68k[opcode].size, "src", "", ""); + flush_amodes (); + genflags (flag_logical, table68k[opcode].size, "src", "", ""); genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_MOVEA: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0); + flush_amodes (); if (table68k[opcode].size == sz_word) { printf ("\tuae_u32 val = (uae_s32)(uae_s16)src;\n"); } else { @@ -1207,6 +1389,7 @@ static void gen_opcode(unsigned long int break; case i_MVSR2: genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 2, 0); + flush_amodes (); printf ("\tMakeSR();\n"); if (table68k[opcode].size == sz_byte) genastore ("regs.sr & 0xff", table68k[opcode].smode, "srcreg", sz_word, "src"); @@ -1215,6 +1398,7 @@ static void gen_opcode(unsigned long int break; case i_MV2SR: genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0); + flush_amodes (); if (table68k[opcode].size == sz_byte) printf ("\tMakeSR();\n\tregs.sr &= 0xFF00;\n\tregs.sr |= src & 0xFF;\n"); else { @@ -1224,49 +1408,55 @@ static void gen_opcode(unsigned long int break; case i_SWAP: genamode (table68k[opcode].smode, "srcreg", sz_long, "src", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 dst = ((src >> 16)&0xFFFF) | ((src&0xFFFF)<<16);\n"); - genflags(flag_logical, sz_long, "dst", "", ""); - genastore ("dst",table68k[opcode].smode, "srcreg", sz_long, "src"); + genflags (flag_logical, sz_long, "dst", "", ""); + genastore ("dst", table68k[opcode].smode, "srcreg", sz_long, "src"); break; case i_EXG: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); - genastore ("dst",table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); - genastore ("src",table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); + flush_amodes (); + genastore ("dst", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); + genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_EXT: genamode (table68k[opcode].smode, "srcreg", sz_long, "src", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 dst = (uae_s32)(uae_s8)src;\n"); break; case sz_word: printf ("\tuae_u16 dst = (uae_s16)(uae_s8)src;\n"); break; case sz_long: printf ("\tuae_u32 dst = (uae_s32)(uae_s16)src;\n"); break; - default: abort(); + default: abort (); } - genflags(flag_logical, - table68k[opcode].size == sz_word ? sz_word : sz_long, "dst", "", ""); - genastore ("dst",table68k[opcode].smode, "srcreg", - table68k[opcode].size == sz_word ? sz_word : sz_long, "src"); + genflags (flag_logical, + table68k[opcode].size == sz_word ? sz_word : sz_long, "dst", "", ""); + genastore ("dst", table68k[opcode].smode, "srcreg", + table68k[opcode].size == sz_word ? sz_word : sz_long, "src"); break; case i_MVMEL: - genmovemel(opcode); + genmovemel (opcode); break; case i_MVMLE: - genmovemle(opcode); + genmovemle (opcode); break; case i_TRAP: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tException(src+32,0);\n"); m68k_pc_offset = 0; break; case i_MVR2USP: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); printf ("\tregs.usp = src;\n"); break; case i_MVUSP2R: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 2, 0); + flush_amodes (); genastore ("regs.usp", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_RESET: @@ -1276,6 +1466,7 @@ static void gen_opcode(unsigned long int break; case i_STOP: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); printf ("\tregs.sr = src;\n"); printf ("\tMakeFromSR();\n"); printf ("\tm68k_setstopped(1);\n"); @@ -1284,6 +1475,7 @@ static void gen_opcode(unsigned long int if (cpu_level == 0) { genamode (Aipi, "7", sz_word, "sr", 1, 0); genamode (Aipi, "7", sz_long, "pc", 1, 0); + flush_amodes (); printf ("\tregs.sr = sr; m68k_setpc_rte(pc);\n"); fill_prefetch_0 (); printf ("\tMakeFromSR();\n"); @@ -1295,6 +1487,7 @@ static void gen_opcode(unsigned long int genamode (Aipi, "7", sz_word, "sr", 1, 0); genamode (Aipi, "7", sz_long, "pc", 1, 0); genamode (Aipi, "7", sz_word, "format", 1, 0); + flush_amodes (); printf ("\tnewsr = sr; newpc = pc;\n"); printf ("\tif ((format & 0xF000) == 0x0000) { break; }\n"); printf ("\telse if ((format & 0xF000) == 0x1000) { ; }\n"); @@ -1309,6 +1502,7 @@ static void gen_opcode(unsigned long int printf ("\tregs.sr = newsr; MakeFromSR();\n"); printf ("\tm68k_setpc_rte(newpc);\n"); fill_prefetch_0 (); + need_endlabel = 1; } /* PC is set and prefetch filled. */ m68k_pc_offset = 0; @@ -1317,6 +1511,7 @@ static void gen_opcode(unsigned long int printf ("\tcompiler_flush_jsr_stack();\n"); genamode (Aipi, "7", sz_long, "pc", 1, 0); genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "offs", 1, 0); + flush_amodes (); printf ("\tm68k_areg(regs, 7) += offs;\n"); printf ("\tm68k_setpc_rte(pc);\n"); fill_prefetch_0 (); @@ -1326,15 +1521,19 @@ static void gen_opcode(unsigned long int case i_LINK: genamode (Apdi, "7", sz_long, "old", 2, 0); genamode (table68k[opcode].smode, "srcreg", sz_long, "src", 1, 0); + flush_amodes (); genastore ("src", Apdi, "7", sz_long, "old"); genastore ("m68k_areg(regs, 7)", table68k[opcode].smode, "srcreg", sz_long, "src"); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "offs", 1, 0); + flush_amodes (); printf ("\tm68k_areg(regs, 7) += offs;\n"); break; case i_UNLK: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); printf ("\tm68k_areg(regs, 7) = src;\n"); genamode (Aipi, "7", sz_long, "old", 1, 0); + flush_amodes (); genastore ("old", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_RTS: @@ -1345,12 +1544,14 @@ static void gen_opcode(unsigned long int case i_TRAPV: sync_m68k_pc (); printf ("\tif(VFLG) { Exception(7,m68k_getpc()); goto %s; }\n", endlabelstr); + need_endlabel = 1; break; case i_RTR: printf ("\tcompiler_flush_jsr_stack();\n"); printf ("\tMakeSR();\n"); genamode (Aipi, "7", sz_word, "sr", 1, 0); genamode (Aipi, "7", sz_long, "pc", 1, 0); + flush_amodes (); printf ("\tregs.sr &= 0xFF00; sr &= 0xFF;\n"); printf ("\tregs.sr |= sr; m68k_setpc(pc);\n"); fill_prefetch_0 (); @@ -1359,18 +1560,21 @@ static void gen_opcode(unsigned long int break; case i_JSR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0); + flush_amodes (); printf ("\tm68k_do_jsr(m68k_getpc() + %d, srca);\n", m68k_pc_offset); fill_prefetch_0 (); m68k_pc_offset = 0; break; case i_JMP: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0); + flush_amodes (); printf ("\tm68k_setpc(srca);\n"); fill_prefetch_0 (); m68k_pc_offset = 0; break; case i_BSR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); printf ("\tuae_s32 s = (uae_s32)src + 2;\n"); if (using_exception_3) { printf ("\tif (src & 1) {\n"); @@ -1378,8 +1582,8 @@ static void gen_opcode(unsigned long int printf ("\t\tlast_fault_for_exception_3 = m68k_getpc() + s;\n"); printf ("\t\tlast_op_for_exception_3 = opcode; Exception(3,0); goto %s;\n", endlabelstr); printf ("\t}\n"); + need_endlabel = 1; } - printf ("\tm68k_do_bsr(m68k_getpc() + %d, s);\n", m68k_pc_offset); fill_prefetch_0 (); m68k_pc_offset = 0; @@ -1392,13 +1596,14 @@ static void gen_opcode(unsigned long int printf ("\t\tlast_addr_for_exception_3 = m68k_getpc() + 2;\n"); printf ("\t\tlast_fault_for_exception_3 = m68k_getpc() + 1;\n"); printf ("\t\tlast_op_for_exception_3 = opcode; Exception(3,0); goto %s;\n", endlabelstr); + need_endlabel = 1; } else { if (next_cpu_level < 1) next_cpu_level = 1; } } - genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); printf ("\tif (!cctrue(%d)) goto didnt_jump;\n", table68k[opcode].cc); if (using_exception_3) { printf ("\tif (src & 1) {\n"); @@ -1406,6 +1611,7 @@ static void gen_opcode(unsigned long int printf ("\t\tlast_fault_for_exception_3 = m68k_getpc() + 2 + (uae_s32)src;\n"); printf ("\t\tlast_op_for_exception_3 = opcode; Exception(3,0); goto %s;\n", endlabelstr); printf ("\t}\n"); + need_endlabel = 1; } #ifdef USE_COMPILER printf ("\tm68k_setpc_bcc(m68k_getpc() + 2 + (uae_s32)src);\n"); @@ -1415,20 +1621,24 @@ static void gen_opcode(unsigned long int fill_prefetch_0 (); printf ("\tgoto %s;\n", endlabelstr); printf ("didnt_jump:;\n"); + need_endlabel = 1; break; case i_LEA: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0); + flush_amodes (); genastore ("srca", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); break; case i_PEA: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 0, 0); genamode (Apdi, "7", sz_long, "dst", 2, 0); + flush_amodes (); genastore ("srca", Apdi, "7", sz_long, "dst"); break; case i_DBcc: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "offs", 1, 0); + flush_amodes (); printf ("\tif (!cctrue(%d)) {\n", table68k[opcode].cc); genastore ("(src-1)", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); @@ -1440,8 +1650,8 @@ static void gen_opcode(unsigned long int printf ("\t\t\tlast_fault_for_exception_3 = m68k_getpc() + 2 + (uae_s32)offs + 2;\n"); printf ("\t\t\tlast_op_for_exception_3 = opcode; Exception(3,0); goto %s;\n", endlabelstr); printf ("\t\t}\n"); + need_endlabel = 1; } - #ifdef USE_COMPILER printf ("\t\t\tm68k_setpc_bcc(m68k_getpc() + (uae_s32)offs + 2);\n"); #else @@ -1451,78 +1661,87 @@ static void gen_opcode(unsigned long int printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t\t}\n"); printf ("\t}\n"); + need_endlabel = 1; break; case i_Scc: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 2, 0); + flush_amodes (); start_brace (); printf ("\tint val = cctrue(%d) ? 0xff : 0;\n", table68k[opcode].cc); - genastore ("val",table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); + genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_DIVU: printf ("\tuaecptr oldpc = m68k_getpc();\n"); genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0); + flush_amodes (); printf ("\tif(src == 0) { Exception(5,oldpc); goto %s; } else {\n", endlabelstr); printf ("\tuae_u32 newv = (uae_u32)dst / (uae_u32)(uae_u16)src;\n"); printf ("\tuae_u32 rem = (uae_u32)dst %% (uae_u32)(uae_u16)src;\n"); /* The N flag appears to be set each time there is an overflow. * Weird. */ printf ("\tif (newv > 0xffff) { VFLG = NFLG = 1; CFLG = 0; } else\n\t{\n"); - genflags(flag_logical, sz_word, "newv", "", ""); + genflags (flag_logical, sz_word, "newv", "", ""); printf ("\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n"); - genastore ("newv",table68k[opcode].dmode, "dstreg", sz_long, "dst"); + genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst"); printf ("\t}\n"); printf ("\t}\n"); + insn_n_cycles += 68; + need_endlabel = 1; break; case i_DIVS: printf ("\tuaecptr oldpc = m68k_getpc();\n"); genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 1, 0); + flush_amodes (); printf ("\tif(src == 0) { Exception(5,oldpc); goto %s; } else {\n", endlabelstr); printf ("\tuae_s32 newv = (uae_s32)dst / (uae_s32)(uae_s16)src;\n"); printf ("\tuae_u16 rem = (uae_s32)dst %% (uae_s32)(uae_s16)src;\n"); printf ("\tif ((newv & 0xffff8000) != 0 && (newv & 0xffff8000) != 0xffff8000) { VFLG = NFLG = 1; CFLG = 0; } else\n\t{\n"); printf ("\tif (((uae_s16)rem < 0) != ((uae_s32)dst < 0)) rem = -rem;\n"); - genflags(flag_logical, sz_word, "newv", "", ""); + genflags (flag_logical, sz_word, "newv", "", ""); printf ("\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n"); - genastore ("newv",table68k[opcode].dmode, "dstreg", sz_long, "dst"); + genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst"); printf ("\t}\n"); printf ("\t}\n"); + insn_n_cycles += 72; + need_endlabel = 1; break; case i_MULU: genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_word, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 newv = (uae_u32)(uae_u16)dst * (uae_u32)(uae_u16)src;\n"); - genflags(flag_logical, sz_long, "newv", "", ""); - genastore ("newv",table68k[opcode].dmode, "dstreg", sz_long, "dst"); -#ifdef WANT_SLOW_MULTIPLY - printf ("\tregs.spcflags |= SPCFLAG_EXTRA_CYCLES;\n"); -#endif + genflags (flag_logical, sz_long, "newv", "", ""); + genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst"); + insn_n_cycles += 32; break; case i_MULS: genamode (table68k[opcode].smode, "srcreg", sz_word, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_word, "dst", 1, 0); + flush_amodes (); start_brace (); printf ("\tuae_u32 newv = (uae_s32)(uae_s16)dst * (uae_s32)(uae_s16)src;\n"); - genflags(flag_logical, sz_long, "newv", "", ""); - genastore ("newv",table68k[opcode].dmode, "dstreg", sz_long, "dst"); -#ifdef WANT_SLOW_MULTIPLY - printf ("\tregs.spcflags |= SPCFLAG_EXTRA_CYCLES;\n"); -#endif + genflags (flag_logical, sz_long, "newv", "", ""); + genastore ("newv", table68k[opcode].dmode, "dstreg", sz_long, "dst"); + insn_n_cycles += 32; break; case i_CHK: printf ("\tuaecptr oldpc = m68k_getpc();\n"); genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); + flush_amodes (); printf ("\tif ((uae_s32)dst < 0) { NFLG=1; Exception(6,oldpc); goto %s; }\n", endlabelstr); printf ("\telse if (dst > src) { NFLG=0; Exception(6,oldpc); goto %s; }\n", endlabelstr); + need_endlabel = 1; break; case i_CHK2: printf ("\tuaecptr oldpc = m68k_getpc();\n"); genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0); + flush_amodes (); printf ("\t{uae_s32 upper,lower,reg = regs.regs[(extra >> 12) & 15];\n"); switch (table68k[opcode].size) { case sz_byte: @@ -1537,42 +1756,44 @@ static void gen_opcode(unsigned long int printf ("\tlower=get_long(dsta); upper = get_long(dsta+4);\n"); break; default: - abort(); + abort (); } printf ("\tZFLG=upper == reg || lower == reg;\n"); printf ("\tCFLG=lower <= upper ? reg < lower || reg > upper : reg > upper || reg < lower;\n"); printf ("\tif ((extra & 0x800) && CFLG) { Exception(6,oldpc); goto %s; }\n}\n", endlabelstr); + need_endlabel = 1; break; case i_ASR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 sign = cmask & val;\n"); printf ("\tcnt &= 63;\n"); printf ("\tVFLG = 0;\n"); printf ("\tif (!cnt) { CFLG = 0; } else {\n"); - printf ("\tif (cnt >= %d) {\n",bit_size(table68k[opcode].size)); - printf ("\t\tval = sign ? %s : 0;\n",bit_mask(table68k[opcode].size)); + printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size)); + printf ("\t\tval = sign ? %s : 0;\n", bit_mask (table68k[opcode].size)); printf ("\t\tCFLG=XFLG= sign ? 1 : 0;\n"); printf ("\t} else {\n"); printf ("\t\tCFLG=XFLG=(val >> (cnt-1)) & 1;\n"); printf ("\t\tval >>= cnt;\n"); printf ("\t\tif (sign) val |= %s << (%d - cnt);\n", - bit_mask(table68k[opcode].size), - bit_size(table68k[opcode].size)); + bit_mask (table68k[opcode].size), + bit_size (table68k[opcode].size)); printf ("\t}}\n"); printf ("\tNFLG = sign != 0;\n"); printf ("\tZFLG = val == 0;\n"); @@ -1581,32 +1802,33 @@ static void gen_opcode(unsigned long int case i_ASL: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tcnt &= 63;\n"); printf ("\tVFLG = 0;\n"); printf ("\tif (!cnt) { CFLG = 0; } else {\n"); - printf ("\tif (cnt >= %d) {\n",bit_size(table68k[opcode].size)); + printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size)); printf ("\t\tVFLG = val != 0;\n"); printf ("\t\tCFLG=XFLG = cnt == %d ? val & 1 : 0;\n", - bit_size(table68k[opcode].size)); + bit_size (table68k[opcode].size)); printf ("\t\tval = 0;\n"); printf ("\t} else {\n"); printf ("\t\tuae_u32 mask = (%s << (%d - cnt)) & %s;\n", - bit_mask(table68k[opcode].size), - bit_size(table68k[opcode].size)-1, - bit_mask(table68k[opcode].size)); + bit_mask (table68k[opcode].size), + bit_size (table68k[opcode].size) - 1, + bit_mask (table68k[opcode].size)); printf ("\t\tCFLG=XFLG=(val << (cnt-1)) & cmask ? 1 : 0;\n"); printf ("\t\tVFLG = (val & mask) != mask && (val & mask) != 0;\n"); printf ("\t\tval <<= cnt;\n"); @@ -1618,24 +1840,25 @@ static void gen_opcode(unsigned long int case i_LSR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tcnt &= 63;\n"); printf ("\tif (!cnt) { CFLG = 0; } else {\n"); - printf ("\tif (cnt >= %d) {\n",bit_size(table68k[opcode].size)); + printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size)); printf ("\t\tCFLG=XFLG = cnt == %d ? (val & cmask ? 1 : 0) : 0;\n", - bit_size(table68k[opcode].size)); + bit_size (table68k[opcode].size)); printf ("\t\tval = 0;\n"); printf ("\t} else {\n"); printf ("\t\tCFLG=XFLG=(val >> (cnt-1)) & 1;\n"); @@ -1647,24 +1870,25 @@ static void gen_opcode(unsigned long int case i_LSL: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tcnt &= 63;\n"); printf ("\tif (!cnt) { CFLG = 0; } else {\n"); - printf ("\tif (cnt >= %d) {\n",bit_size(table68k[opcode].size)); + printf ("\tif (cnt >= %d) {\n", bit_size (table68k[opcode].size)); printf ("\t\tCFLG=XFLG = cnt == %d ? val & 1 : 0;\n", - bit_size(table68k[opcode].size)); + bit_size (table68k[opcode].size)); printf ("\t\tval = 0;\n"); printf ("\t} else {\n"); printf ("\t\tCFLG=XFLG=(val << (cnt-1)) & cmask ? 1 : 0;\n"); @@ -1676,18 +1900,19 @@ static void gen_opcode(unsigned long int case i_ROL: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tcnt &= 63;\n"); printf ("\tif (!cnt) { CFLG = 0; } else {\n"); @@ -1703,18 +1928,19 @@ static void gen_opcode(unsigned long int case i_ROR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tcnt &= 63;\n"); printf ("\tif (!cnt) { CFLG = 0; } else {"); @@ -1730,18 +1956,19 @@ static void gen_opcode(unsigned long int case i_ROXL: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry;\n"); printf ("\tcnt &= 63;\n"); @@ -1757,18 +1984,19 @@ static void gen_opcode(unsigned long int case i_ROXR: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "cnt", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry;\n"); printf ("\tcnt &= 63;\n"); @@ -1783,19 +2011,20 @@ static void gen_opcode(unsigned long int break; case i_ASRW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); printf ("\tVFLG = 0;\n"); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 sign = cmask & val;\n"); printf ("\tCFLG=XFLG=val&1; val = (val >> 1) | sign;\n"); @@ -1805,19 +2034,20 @@ static void gen_opcode(unsigned long int break; case i_ASLW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); printf ("\tVFLG = 0;\n"); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 sign = cmask & val;\n"); printf ("\tCFLG=XFLG=(val&cmask)!=0; val <<= 1;\n"); @@ -1828,140 +2058,148 @@ static void gen_opcode(unsigned long int break; case i_LSRW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry = val&1;\n"); printf ("\tval >>= 1;\n"); - genflags(flag_logical, table68k[opcode].size, "val", "", ""); + genflags (flag_logical, table68k[opcode].size, "val", "", ""); printf ("CFLG = XFLG = carry!=0;\n"); genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data"); break; case i_LSLW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry = val&cmask;\n"); printf ("\tval <<= 1;\n"); - genflags(flag_logical, table68k[opcode].size, "val", "", ""); + genflags (flag_logical, table68k[opcode].size, "val", "", ""); printf ("CFLG = XFLG = carry!=0;\n"); genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data"); break; case i_ROLW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry = val&cmask;\n"); printf ("\tval <<= 1;\n"); printf ("\tif(carry) val |= 1;\n"); - genflags(flag_logical, table68k[opcode].size, "val", "", ""); + genflags (flag_logical, table68k[opcode].size, "val", "", ""); printf ("CFLG = carry!=0;\n"); genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data"); break; case i_RORW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry = val&1;\n"); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tval >>= 1;\n"); printf ("\tif(carry) val |= cmask;\n"); - genflags(flag_logical, table68k[opcode].size, "val", "", ""); + genflags (flag_logical, table68k[opcode].size, "val", "", ""); printf ("CFLG = carry!=0;\n"); genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data"); break; case i_ROXLW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry = val&cmask;\n"); printf ("\tval <<= 1;\n"); printf ("\tif(XFLG) val |= 1;\n"); printf ("\tXFLG = carry != 0;\n"); - genflags(flag_logical, table68k[opcode].size, "val", "", ""); + genflags (flag_logical, table68k[opcode].size, "val", "", ""); printf ("XFLG = CFLG = carry!=0;\n"); genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data"); break; case i_ROXRW: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "data", 1, 0); + flush_amodes (); start_brace (); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u8 val = data;\n"); break; case sz_word: printf ("\tuae_u16 val = data;\n"); break; case sz_long: printf ("\tuae_u32 val = data;\n"); break; - default: abort(); + default: abort (); } printf ("\tuae_u32 carry = val&1;\n"); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tuae_u32 cmask = 0x80;\n"); break; case sz_word: printf ("\tuae_u32 cmask = 0x8000;\n"); break; case sz_long: printf ("\tuae_u32 cmask = 0x80000000;\n"); break; - default: abort(); + default: abort (); } printf ("\tval >>= 1;\n"); printf ("\tif(XFLG) val |= cmask;\n"); printf ("\tXFLG = carry != 0;\n"); - genflags(flag_logical, table68k[opcode].size, "val", "", ""); + genflags (flag_logical, table68k[opcode].size, "val", "", ""); printf ("XFLG = CFLG = carry!=0;\n"); genastore ("val", table68k[opcode].smode, "srcreg", table68k[opcode].size, "data"); break; case i_MOVEC2: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); - start_brace(); + flush_amodes (); + start_brace (); printf ("\tint regno = (src >> 12) & 15;\n"); printf ("\tuae_u32 *regp = regs.regs + regno;\n"); printf ("\tm68k_movec2(src & 0xFFF, regp);\n"); break; case i_MOVE2C: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); - start_brace(); + flush_amodes (); + start_brace (); printf ("\tint regno = (src >> 12) & 15;\n"); printf ("\tuae_u32 *regp = regs.regs + regno;\n"); printf ("\tm68k_move2c(src & 0xFFF, regp);\n"); @@ -1971,14 +2209,15 @@ static void gen_opcode(unsigned long int int old_brace_level; genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); - start_brace(); + flush_amodes (); + start_brace (); printf ("\tint ru = (src >> 6) & 7;\n"); printf ("\tint rc = src & 7;\n"); - genflags(flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, rc)", "dst"); + genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, rc)", "dst"); printf ("\tif (ZFLG)"); old_brace_level = n_braces; start_brace (); - genastore ("(m68k_dreg(regs, ru))",table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); + genastore ("(m68k_dreg(regs, ru))", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); pop_braces (old_brace_level); printf ("else"); start_brace (); @@ -1988,60 +2227,64 @@ static void gen_opcode(unsigned long int break; case i_CAS2: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); + flush_amodes (); printf ("\tuae_u32 rn1 = regs.regs[(extra >> 28) & 7];\n"); printf ("\tuae_u32 rn2 = regs.regs[(extra >> 12) & 7];\n"); if (table68k[opcode].size == sz_word) { - int old_brace_level = n_braces; - printf ("\tuae_u16 dst1 = get_word(rn1), dst2 = get_word(rn2);\n"); - genflags(flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1"); - printf ("\tif (ZFLG) {\n"); - genflags(flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, extra & 7)", "dst2"); - printf ("\tif (ZFLG) {\n"); - printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n"); - printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n"); - printf ("\t}}\n"); - pop_braces (old_brace_level); - printf ("\tif (!ZFLG) {\n"); - printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = (m68k_dreg(regs, (extra >> 22) & 7) & ~0xffff) | (dst1 & 0xffff);\n"); - printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = (m68k_dreg(regs, (extra >> 6) & 7) & ~0xffff) | (dst2 & 0xffff);\n"); - printf ("\t}\n"); + int old_brace_level = n_braces; + printf ("\tuae_u16 dst1 = get_word(rn1), dst2 = get_word(rn2);\n"); + genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1"); + printf ("\tif (ZFLG) {\n"); + genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, extra & 7)", "dst2"); + printf ("\tif (ZFLG) {\n"); + printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n"); + printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n"); + printf ("\t}}\n"); + pop_braces (old_brace_level); + printf ("\tif (!ZFLG) {\n"); + printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = (m68k_dreg(regs, (extra >> 22) & 7) & ~0xffff) | (dst1 & 0xffff);\n"); + printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = (m68k_dreg(regs, (extra >> 6) & 7) & ~0xffff) | (dst2 & 0xffff);\n"); + printf ("\t}\n"); } else { - int old_brace_level = n_braces; - printf ("\tuae_u32 dst1 = get_long(rn1), dst2 = get_long(rn2);\n"); - genflags(flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1"); - printf ("\tif (ZFLG) {\n"); - genflags(flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, extra & 7)", "dst2"); - printf ("\tif (ZFLG) {\n"); - printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n"); - printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n"); - printf ("\t}}\n"); - pop_braces (old_brace_level); - printf ("\tif (!ZFLG) {\n"); - printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = dst1;\n"); - printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = dst2;\n"); - printf ("\t}\n"); + int old_brace_level = n_braces; + printf ("\tuae_u32 dst1 = get_long(rn1), dst2 = get_long(rn2);\n"); + genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1"); + printf ("\tif (ZFLG) {\n"); + genflags (flag_cmp, table68k[opcode].size, "newv", "m68k_dreg(regs, extra & 7)", "dst2"); + printf ("\tif (ZFLG) {\n"); + printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n"); + printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n"); + printf ("\t}}\n"); + pop_braces (old_brace_level); + printf ("\tif (!ZFLG) {\n"); + printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = dst1;\n"); + printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = dst2;\n"); + printf ("\t}\n"); } break; - case i_MOVES: /* ignore DFC and SFC because we have no MMU */ + case i_MOVES: /* ignore DFC and SFC because we have no MMU */ { int old_brace_level; genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); + flush_amodes (); printf ("\tif (extra & 0x800)\n"); old_brace_level = n_braces; start_brace (); printf ("\tuae_u32 src = regs.regs[(extra >> 12) & 15];\n"); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 2, 0); + flush_amodes (); genastore ("src", table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst"); pop_braces (old_brace_level); printf ("else"); start_brace (); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "src", 1, 0); + flush_amodes (); printf ("\tif (extra & 0x8000) {\n"); - switch(table68k[opcode].size) { + switch (table68k[opcode].size) { case sz_byte: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s8)src;\n"); break; case sz_word: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s16)src;\n"); break; case sz_long: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = src;\n"); break; - default: abort(); + default: abort (); } printf ("\t} else {\n"); genastore ("src", Dreg, "(extra >> 12) & 7", table68k[opcode].size, ""); @@ -2049,22 +2292,24 @@ static void gen_opcode(unsigned long int pop_braces (old_brace_level); } break; - case i_BKPT: /* only needed for hardware emulators */ - sync_m68k_pc(); + case i_BKPT: /* only needed for hardware emulators */ + sync_m68k_pc (); printf ("\top_illg(opcode);\n"); break; - case i_CALLM: /* not present in 68030 */ - sync_m68k_pc(); + case i_CALLM: /* not present in 68030 */ + sync_m68k_pc (); printf ("\top_illg(opcode);\n"); break; - case i_RTM: /* not present in 68030 */ - sync_m68k_pc(); + case i_RTM: /* not present in 68030 */ + sync_m68k_pc (); printf ("\top_illg(opcode);\n"); break; case i_TRAPcc: if (table68k[opcode].smode != am_unknown && table68k[opcode].smode != am_illg) genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "dummy", 1, 0); + flush_amodes (); printf ("\tif (cctrue(%d)) { Exception(7,m68k_getpc()); goto %s; }\n", table68k[opcode].cc, endlabelstr); + need_endlabel = 1; break; case i_DIVL: sync_m68k_pc (); @@ -2072,13 +2317,15 @@ static void gen_opcode(unsigned long int printf ("\tuaecptr oldpc = m68k_getpc();\n"); genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tm68k_divl(opcode, dst, extra, oldpc);\n"); break; case i_MULL: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "dst", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tm68k_mull(opcode, dst, extra);\n"); break; case i_BFTST: @@ -2091,7 +2338,8 @@ static void gen_opcode(unsigned long int case i_BFINS: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); genamode (table68k[opcode].dmode, "dstreg", sz_long, "dst", 2, 0); - start_brace(); + flush_amodes (); + start_brace (); printf ("\tuae_s32 offset = extra & 0x800 ? m68k_dreg(regs, (extra >> 6) & 7) : (extra >> 6) & 0x1f;\n"); printf ("\tint width = (((extra & 0x20 ? m68k_dreg(regs, extra & 7) : extra) -1) & 0x1f) +1;\n"); if (table68k[opcode].dmode == Dreg) { @@ -2104,7 +2352,7 @@ static void gen_opcode(unsigned long int } printf ("\ttmp >>= (32 - width);\n"); printf ("\tNFLG = tmp & (1 << (width-1)) ? 1 : 0;ZFLG = tmp == 0;VFLG = 0;CFLG = 0;\n"); - switch(table68k[opcode].mnemo) { + switch (table68k[opcode].mnemo) { case i_BFTST: break; case i_BFEXTU: @@ -2134,41 +2382,42 @@ static void gen_opcode(unsigned long int default: break; } - if (table68k[opcode].mnemo == i_BFCHG || - table68k[opcode].mnemo == i_BFCLR || - table68k[opcode].mnemo == i_BFSET || - table68k[opcode].mnemo == i_BFINS) { - printf ("\ttmp <<= (32 - width);\n"); - if (table68k[opcode].dmode == Dreg) { - printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & ((offset & 0x1f) == 0 ? 0 :\n"); - printf ("\t\t(0xffffffff << (32 - (offset & 0x1f))))) |\n"); - printf ("\t\t(tmp >> (offset & 0x1f)) |\n"); - printf ("\t\t(((offset & 0x1f) + width) >= 32 ? 0 :\n"); - printf (" (m68k_dreg(regs, dstreg) & ((uae_u32)0xffffffff >> ((offset & 0x1f) + width))));\n"); - } else { - printf ("\tbf0 = (bf0 & (0xff000000 << (8 - (offset & 7)))) |\n"); - printf ("\t\t(tmp >> (offset & 7)) |\n"); - printf ("\t\t(((offset & 7) + width) >= 32 ? 0 :\n"); - printf ("\t\t (bf0 & ((uae_u32)0xffffffff >> ((offset & 7) + width))));\n"); - printf ("\tput_long(dsta,bf0 );\n"); - printf ("\tif (((offset & 7) + width) > 32) {\n"); - printf ("\t\tbf1 = (bf1 & (0xff >> (width - 32 + (offset & 7)))) |\n"); - printf ("\t\t\t(tmp << (8 - (offset & 7)));\n"); - printf ("\t\tput_byte(dsta+4,bf1);\n"); - printf ("\t}\n"); - } + if (table68k[opcode].mnemo == i_BFCHG + || table68k[opcode].mnemo == i_BFCLR + || table68k[opcode].mnemo == i_BFSET + || table68k[opcode].mnemo == i_BFINS) + { + printf ("\ttmp <<= (32 - width);\n"); + if (table68k[opcode].dmode == Dreg) { + printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & ((offset & 0x1f) == 0 ? 0 :\n"); + printf ("\t\t(0xffffffff << (32 - (offset & 0x1f))))) |\n"); + printf ("\t\t(tmp >> (offset & 0x1f)) |\n"); + printf ("\t\t(((offset & 0x1f) + width) >= 32 ? 0 :\n"); + printf (" (m68k_dreg(regs, dstreg) & ((uae_u32)0xffffffff >> ((offset & 0x1f) + width))));\n"); + } else { + printf ("\tbf0 = (bf0 & (0xff000000 << (8 - (offset & 7)))) |\n"); + printf ("\t\t(tmp >> (offset & 7)) |\n"); + printf ("\t\t(((offset & 7) + width) >= 32 ? 0 :\n"); + printf ("\t\t (bf0 & ((uae_u32)0xffffffff >> ((offset & 7) + width))));\n"); + printf ("\tput_long(dsta,bf0 );\n"); + printf ("\tif (((offset & 7) + width) > 32) {\n"); + printf ("\t\tbf1 = (bf1 & (0xff >> (width - 32 + (offset & 7)))) |\n"); + printf ("\t\t\t(tmp << (8 - (offset & 7)));\n"); + printf ("\t\tput_byte(dsta+4,bf1);\n"); + printf ("\t}\n"); + } } break; case i_PACK: if (table68k[opcode].smode == Dreg) { - printf ("\tuae_u16 val = m68k_dreg(regs, srcreg) + %s;\n", gen_nextiword()); + printf ("\tuae_u16 val = m68k_dreg(regs, srcreg) + %s;\n", gen_nextiword ()); printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & 0xffffff00) | ((val >> 4) & 0xf0) | (val & 0xf);\n"); } else { printf ("\tuae_u16 val;\n"); printf ("\tm68k_areg(regs, srcreg) -= areg_byteinc[srcreg];\n"); printf ("\tval = (uae_u16)get_byte(m68k_areg(regs, srcreg));\n"); printf ("\tm68k_areg(regs, srcreg) -= areg_byteinc[srcreg];\n"); - printf ("\tval = (val | ((uae_u16)get_byte(m68k_areg(regs, srcreg)) << 8)) + %s;\n", gen_nextiword()); + printf ("\tval = (val | ((uae_u16)get_byte(m68k_areg(regs, srcreg)) << 8)) + %s;\n", gen_nextiword ()); printf ("\tm68k_areg(regs, dstreg) -= areg_byteinc[dstreg];\n"); printf ("\tput_byte(m68k_areg(regs, dstreg),((val >> 4) & 0xf0) | (val & 0xf));\n"); } @@ -2176,13 +2425,13 @@ static void gen_opcode(unsigned long int case i_UNPK: if (table68k[opcode].smode == Dreg) { printf ("\tuae_u16 val = m68k_dreg(regs, srcreg);\n"); - printf ("\tval = (((val << 4) & 0xf00) | (val & 0xf)) + %s;\n", gen_nextiword()); + printf ("\tval = (((val << 4) & 0xf00) | (val & 0xf)) + %s;\n", gen_nextiword ()); printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & 0xffff0000) | (val & 0xffff);\n"); } else { printf ("\tuae_u16 val;\n"); printf ("\tm68k_areg(regs, srcreg) -= areg_byteinc[srcreg];\n"); printf ("\tval = (uae_u16)get_byte(m68k_areg(regs, srcreg));\n"); - printf ("\tval = (((val << 4) & 0xf00) | (val & 0xf)) + %s;\n", gen_nextiword()); + printf ("\tval = (((val << 4) & 0xf00) | (val & 0xf)) + %s;\n", gen_nextiword ()); printf ("\tm68k_areg(regs, dstreg) -= areg_byteinc[dstreg];\n"); printf ("\tput_byte(m68k_areg(regs, dstreg),val);\n"); printf ("\tm68k_areg(regs, dstreg) -= areg_byteinc[dstreg];\n"); @@ -2191,65 +2440,71 @@ static void gen_opcode(unsigned long int break; case i_TAS: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "src", 1, 0); - genflags(flag_logical, table68k[opcode].size, "src", "", ""); + flush_amodes (); + genflags (flag_logical, table68k[opcode].size, "src", "", ""); printf ("\tsrc |= 0x80;\n"); genastore ("src", table68k[opcode].smode, "srcreg", table68k[opcode].size, "src"); break; case i_FPP: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tfpp_opp(opcode,extra);\n"); break; case i_FDBcc: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tfdbcc_opp(opcode,extra);\n"); break; case i_FScc: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tfscc_opp(opcode,extra);\n"); break; case i_FTRAPcc: - sync_m68k_pc(); - start_brace(); + sync_m68k_pc (); + start_brace (); printf ("\tuaecptr oldpc = m68k_getpc();\n"); if (table68k[opcode].smode != am_unknown && table68k[opcode].smode != am_illg) genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "dummy", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tftrapcc_opp(opcode,oldpc);\n"); break; case i_FBcc: - sync_m68k_pc(); - start_brace(); + sync_m68k_pc (); + start_brace (); printf ("\tuaecptr pc = m68k_getpc();\n"); genamode (table68k[opcode].dmode, "srcreg", table68k[opcode].size, "extra", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tfbcc_opp(opcode,pc,extra);\n"); break; case i_FSAVE: - sync_m68k_pc(); + sync_m68k_pc (); printf ("\tfsave_opp(opcode);\n"); break; case i_FRESTORE: - sync_m68k_pc(); + sync_m68k_pc (); printf ("\tfrestore_opp(opcode);\n"); break; case i_MMUOP: genamode (table68k[opcode].smode, "srcreg", table68k[opcode].size, "extra", 1, 0); - sync_m68k_pc(); + flush_amodes (); + sync_m68k_pc (); printf ("\tmmu_op(opcode,extra);\n"); break; default: - abort(); + abort (); break; - }; + } finish_braces (); sync_m68k_pc (); - printf ("%s: (void)0;\n", endlabelstr); } -static void generate_includes (FILE *f) +static void generate_includes (FILE * f) { fprintf (f, "#include \"sysconfig.h\"\n"); fprintf (f, "#include \"sysdeps.h\"\n"); @@ -2276,7 +2531,7 @@ static void generate_one_opcode (int rp) || table68k[opcode].clev > cpu_level) return; - for (i = 0; lookuptab[i].name[0] ; i++) { + for (i = 0; lookuptab[i].name[0]; i++) { if (table68k[opcode].mnemo == lookuptab[i].mnemo) break; } @@ -2291,7 +2546,7 @@ static void generate_one_opcode (int rp) } fprintf (stblfile, "{ op_%lx_%d, 0, %ld }, /* %s */\n", opcode, postfix, opcode, lookuptab[i].name); fprintf (headerfile, "extern cpuop_func op_%lx_%d;\n", opcode, postfix); - printf ("void REGPARAM2 op_%lx_%d(uae_u32 opcode) /* %s */\n{\n", opcode, postfix, lookuptab[i].name); + printf ("unsigned long REGPARAM2 op_%lx_%d(uae_u32 opcode) /* %s */\n{\n", opcode, postfix, lookuptab[i].name); switch (table68k[opcode].stype) { case 0: smsk = 7; break; @@ -2300,59 +2555,103 @@ static void generate_one_opcode (int rp) case 3: smsk = 7; break; case 4: smsk = 7; break; case 5: smsk = 63; break; - default: abort(); + default: abort (); } dmsk = 7; next_cpu_level = -1; if (table68k[opcode].suse - && table68k[opcode].smode != imm && table68k[opcode].smode != imm0 + && table68k[opcode].smode != imm && table68k[opcode].smode != imm0 && table68k[opcode].smode != imm1 && table68k[opcode].smode != imm2 && table68k[opcode].smode != absw && table68k[opcode].smode != absl && table68k[opcode].smode != PC8r && table68k[opcode].smode != PC16) { if (table68k[opcode].spos == -1) { - if (((int)table68k[opcode].sreg) >= 128) - printf ("\tuae_u32 srcreg = (uae_s32)(uae_s8)%d;\n", (int)table68k[opcode].sreg); + if (((int) table68k[opcode].sreg) >= 128) + printf ("\tuae_u32 srcreg = (uae_s32)(uae_s8)%d;\n", (int) table68k[opcode].sreg); else - printf ("\tuae_u32 srcreg = %d;\n", (int)table68k[opcode].sreg); + printf ("\tuae_u32 srcreg = %d;\n", (int) table68k[opcode].sreg); } else { char source[100]; + + /* Check that we can do the little endian optimization safely. */ + if (table68k[opcode].spos < 8 && (smsk << table68k[opcode].spos) > 255) + abort (); + printf ("#ifdef HAVE_GET_WORD_UNSWAPPED\n"); + + if (table68k[opcode].spos != 8) + sprintf (source, "((opcode >> %d) & %d)", (int) table68k[opcode].spos ^ 8, smsk); + else + sprintf (source, "(opcode & %d)", smsk); + + if (table68k[opcode].stype == 3) + printf ("\tuae_u32 srcreg = imm8_table[%s];\n", source); + else if (table68k[opcode].stype == 1) + printf ("\tuae_u32 srcreg = (uae_s32)(uae_s8)%s;\n", source); + else + printf ("\tuae_u32 srcreg = %s;\n", source); + + printf ("#else\n"); + if (table68k[opcode].spos) - sprintf (source,"((opcode >> %d) & %d)",(int)table68k[opcode].spos,smsk); + sprintf (source, "((opcode >> %d) & %d)", (int) table68k[opcode].spos, smsk); else - sprintf (source,"(opcode & %d)",smsk); - + sprintf (source, "(opcode & %d)", smsk); + if (table68k[opcode].stype == 3) printf ("\tuae_u32 srcreg = imm8_table[%s];\n", source); else if (table68k[opcode].stype == 1) printf ("\tuae_u32 srcreg = (uae_s32)(uae_s8)%s;\n", source); else printf ("\tuae_u32 srcreg = %s;\n", source); + + printf ("#endif\n"); } } if (table68k[opcode].duse /* Yes, the dmode can be imm, in case of LINK or DBcc */ - && table68k[opcode].dmode != imm && table68k[opcode].dmode != imm0 + && table68k[opcode].dmode != imm && table68k[opcode].dmode != imm0 && table68k[opcode].dmode != imm1 && table68k[opcode].dmode != imm2 - && table68k[opcode].dmode != absw && table68k[opcode].dmode != absl) { + && table68k[opcode].dmode != absw && table68k[opcode].dmode != absl) + { if (table68k[opcode].dpos == -1) { - if (((int)table68k[opcode].dreg) >= 128) - printf ("\tuae_u32 dstreg = (uae_s32)(uae_s8)%d;\n", (int)table68k[opcode].dreg); + if (((int) table68k[opcode].dreg) >= 128) + printf ("\tuae_u32 dstreg = (uae_s32)(uae_s8)%d;\n", (int) table68k[opcode].dreg); else - printf ("\tuae_u32 dstreg = %d;\n", (int)table68k[opcode].dreg); + printf ("\tuae_u32 dstreg = %d;\n", (int) table68k[opcode].dreg); } else { - if (table68k[opcode].dpos) + int pos = table68k[opcode].dpos; + /* Check that we can do the little endian optimization safely. */ + if (pos < 8 && (dmsk << pos) > 255) + abort (); + + printf ("#ifdef HAVE_GET_WORD_UNSWAPPED\n"); + + if (pos != 8) + printf ("\tuae_u32 dstreg = (opcode >> %d) & %d;\n", + pos ^ 8, dmsk); + else + printf ("\tuae_u32 dstreg = opcode & %d;\n", dmsk); + + printf ("#else\n"); + + if (pos) printf ("\tuae_u32 dstreg = (opcode >> %d) & %d;\n", - (int)table68k[opcode].dpos,dmsk); + pos, dmsk); else printf ("\tuae_u32 dstreg = opcode & %d;\n", dmsk); + + printf ("#endif\n"); } } + need_endlabel = 0; endlabelno++; sprintf (endlabelstr, "endlabel%d", endlabelno); gen_opcode (opcode); + if (need_endlabel) + printf ("%s: (void)0;\n", endlabelstr); + printf ("return %d;\n", insn_n_cycles); printf ("}\n"); opcode_next_clev[rp] = next_cpu_level; opcode_last_postfix[rp] = postfix; @@ -2360,7 +2659,7 @@ static void generate_one_opcode (int rp) static void generate_func (void) { - int i, rp; + int i, j, rp; using_prefetch = 0; using_exception_3 = 0; @@ -2376,28 +2675,52 @@ static void generate_func (void) postfix = i; fprintf (stblfile, "struct cputbl op_smalltbl_%d[] = {\n", postfix); - for (rp = 0; rp < nr_cpuop_funcs; rp++) - generate_one_opcode (rp); + /* sam: this is for people with low memory (eg. me :)) */ + printf ("\n" + "#if !defined(PART_1) && !defined(PART_2) && " + "!defined(PART_3) && !defined(PART_4) && " + "!defined(PART_5) && !defined(PART_6) && " + "!defined(PART_7) && !defined(PART_8)" + "\n" + "#define PART_1 1\n" + "#define PART_2 1\n" + "#define PART_3 1\n" + "#define PART_4 1\n" + "#define PART_5 1\n" + "#define PART_6 1\n" + "#define PART_7 1\n" + "#define PART_8 1\n" + "#endif\n\n"); + + rp = 0; + for(j=1;j<=8;++j) { + int k = (j*nr_cpuop_funcs)/8; + printf ("#ifdef PART_%d\n",j); + for (; rp < k; rp++) + generate_one_opcode (rp); + printf ("#endif\n\n"); + } + fprintf (stblfile, "{ 0, 0, 0 }};\n"); } } int main (int argc, char **argv) -{ +{ read_table68k (); do_merges (); - opcode_map = (int *)xmalloc (sizeof (int) * nr_cpuop_funcs); - opcode_last_postfix = (int *)xmalloc (sizeof (int) * nr_cpuop_funcs); - opcode_next_clev = (int *)xmalloc (sizeof (int) * nr_cpuop_funcs); - counts = (unsigned long *)xmalloc (65536 * sizeof (unsigned long)); - read_counts(); + opcode_map = (int *) xmalloc (sizeof (int) * nr_cpuop_funcs); + opcode_last_postfix = (int *) xmalloc (sizeof (int) * nr_cpuop_funcs); + opcode_next_clev = (int *) xmalloc (sizeof (int) * nr_cpuop_funcs); + counts = (unsigned long *) xmalloc (65536 * sizeof (unsigned long)); + read_counts (); /* It would be a lot nicer to put all in one file (we'd also get rid of * cputbl.h that way), but cpuopti can't cope. That could be fixed, but * I don't dare to touch the 68k version. */ - + headerfile = fopen ("cputbl.h", "wb"); stblfile = fopen ("cpustbl.c", "wb"); freopen ("cpuemu.c", "wb", stdout);