--- hatari/src/uae-cpu/gencpu.c	2019/04/09 08:52:12	1.1.1.15
+++ hatari/src/uae-cpu/gencpu.c	2019/04/09 08:53:25	1.1.1.16
@@ -19,8 +19,8 @@
  *
  * Adaptation to Hatari and better cpu timings by Thomas Huth
  *
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  */
 
 
@@ -1280,23 +1280,35 @@ static void gen_opcode (unsigned long in
 	genamode (curi->smode, "srcreg", curi->size, "src", 1, 0);
 
 	printf ("\tuaecptr memp = m68k_areg(regs, dstreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword ());
+	/* [NP] Use MovepByteNbr to keep track of each access inside a movep */
 	if (curi->size == sz_word) {
 	    printf ("\tMovepByteNbr=1; put_byte(memp, src >> 8); MovepByteNbr=2; put_byte(memp + 2, src);\n");
 	} else {
 	    printf ("\tMovepByteNbr=1; put_byte(memp, src >> 24); MovepByteNbr=2; put_byte(memp + 2, src >> 16);\n");
 	    printf ("\tMovepByteNbr=3; put_byte(memp + 4, src >> 8); MovepByteNbr=4; put_byte(memp + 6, src);\n");
 	}
+	printf ("\tMovepByteNbr=0;\n");
         if(curi->size==sz_long)  insn_n_cycles=24;  else  insn_n_cycles=16;
 	break;
     case i_MVPMR:
 	printf ("\tuaecptr memp = m68k_areg(regs, srcreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword ());
 	genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0);
+	/* [NP] Use MovepByteNbr to keep track of each access inside a movep */
 	if (curi->size == sz_word) {
-	    printf ("\tuae_u16 val = (get_byte(memp) << 8) + get_byte(memp + 2);\n");
+	    //printf ("\tuae_u16 val = (get_byte(memp) << 8) + get_byte(memp + 2);\n");
+	    printf ("\tuae_u16 val;\n");
+	    printf ("\tMovepByteNbr=1; val = (get_byte(memp) << 8);\n");
+	    printf ("\tMovepByteNbr=2; val += get_byte(memp + 2);\n");
 	} else {
-	    printf ("\tuae_u32 val = (get_byte(memp) << 24) + (get_byte(memp + 2) << 16)\n");
-	    printf ("              + (get_byte(memp + 4) << 8) + get_byte(memp + 6);\n");
+	    //printf ("\tuae_u32 val = (get_byte(memp) << 24) + (get_byte(memp + 2) << 16)\n");
+	    //printf ("              + (get_byte(memp + 4) << 8) + get_byte(memp + 6);\n");
+	    printf ("\tuae_u32 val;\n");
+	    printf ("\tMovepByteNbr=1; val = (get_byte(memp) << 24);\n");
+	    printf ("\tMovepByteNbr=2; val += (get_byte(memp + 2) << 16);\n");
+	    printf ("\tMovepByteNbr=3; val += (get_byte(memp + 4) << 8);\n");
+	    printf ("\tMovepByteNbr=4; val += get_byte(memp + 6);\n");
 	}
+	printf ("\tMovepByteNbr=0;\n");
 	genastore ("val", curi->dmode, "dstreg", curi->size, "dst");
         if(curi->size==sz_long)  insn_n_cycles=24;  else  insn_n_cycles=16;
 	break;