--- hatari/src/uae-cpu/fpp.c	2019/04/01 07:15:37	1.1.1.8
+++ hatari/src/uae-cpu/fpp.c	2019/04/09 08:50:34	1.1.1.11
@@ -10,7 +10,7 @@
   * 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.
   */
-const char FPP_rcsid[] = "Hatari $Id: fpp.c,v 1.1.1.8 2019/04/01 07:15:37 root Exp $";
+const char FPP_fileid[] = "Hatari fpp.c : " __DATE__ " " __TIME__;
 
 
 #define __USE_ISOC9X  /* We might be able to pick up a NaN */
@@ -658,7 +658,7 @@ void ftrapcc_opp (uae_u32 opcode, uaecpt
 	op_illg (opcode);
     }
     if (cc)
-	Exception (7, oldpc - 2, M68000_EXCEPTION_SRC_CPU);
+	Exception (7, oldpc - 2, M68000_EXC_SRC_CPU);
 }
 
 void fbcc_opp (uae_u32 opcode, uaecptr pc, uae_u32 extra)
@@ -1358,6 +1358,9 @@ void restore_fpu (void)
     int model, i;
 
     model = restore_u32();
+    if (model != 0 && (model < 68040 || model > 68060)) {
+	fprintf(stderr, "Warning: Unexpected CPU model\n");
+    }
 
     for (i = 0; i < 8; i++) {
 	uae_u32 w1 = restore_u32 ();