--- hatari/src/uae-cpu/fpp.c	2019/04/01 07:11:37	1.1.1.3
+++ hatari/src/uae-cpu/fpp.c	2019/04/01 07:13:13	1.1.1.5
@@ -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.
   */
-char FPP_rcsid[] = "Hatari $Id: fpp.c,v 1.1.1.3 2019/04/01 07:11:37 root Exp $";
+const char FPP_rcsid[] = "Hatari $Id: fpp.c,v 1.1.1.5 2019/04/01 07:13:13 root Exp $";
 
 
 #define __USE_ISOC9X  /* We might be able to pick up a NaN */
@@ -197,8 +197,8 @@ STATIC_INLINE int get_fp_value (uae_u32
     int mode;
     int reg;
     uae_u32 ad = 0;
-    static int sz1[8] = { 4, 4, 12, 12, 2, 8, 1, 0 };
-    static int sz2[8] = { 4, 4, 12, 12, 2, 8, 2, 0 };
+    static const int sz1[8] = { 4, 4, 12, 12, 2, 8, 1, 0 };
+    static const int sz2[8] = { 4, 4, 12, 12, 2, 8, 2, 0 };
 
     if ((extra & 0x4000) == 0) {
 	*src = regs.fp[(extra >> 10) & 7];
@@ -325,8 +325,8 @@ STATIC_INLINE int put_fp_value (fptype v
     int mode;
     int reg;
     uae_u32 ad;
-    static int sz1[8] = { 4, 4, 12, 12, 2, 8, 1, 0 };
-    static int sz2[8] = { 4, 4, 12, 12, 2, 8, 2, 0 };
+    static const int sz1[8] = { 4, 4, 12, 12, 2, 8, 1, 0 };
+    static const int sz2[8] = { 4, 4, 12, 12, 2, 8, 2, 0 };
 
     if ((extra & 0x4000) == 0) {
 	regs.fp[(extra >> 10) & 7] = value;
@@ -616,7 +616,7 @@ void fdbcc_opp (uae_u32 opcode, uae_u16
 
 void fscc_opp (uae_u32 opcode, uae_u16 extra)
 {
-    uae_u32 ad;
+    uae_u32 ad = 0;
     int cc;
 
 #if DEBUG_FPP
@@ -676,7 +676,7 @@ void fbcc_opp (uae_u32 opcode, uaecptr p
 
 void fsave_opp (uae_u32 opcode)
 {
-    uae_u32 ad;
+    uae_u32 ad = 0;
     int incr = (opcode & 0x38) == 0x20 ? -1 : 1;
     int i;
 
@@ -728,7 +728,7 @@ void fsave_opp (uae_u32 opcode)
 
 void frestore_opp (uae_u32 opcode)
 {
-    uae_u32 ad;
+    uae_u32 ad = 0;
     uae_u32 d;
     int incr = (opcode & 0x38) == 0x20 ? -1 : 1;
 
@@ -865,7 +865,7 @@ void fpp_opp (uae_u32 opcode, uae_u16 ex
 	    }
 	} else if (extra & 0x2000) {
 	    /* FMOVEM FPP->memory */
-	    uae_u32 ad;
+	    uae_u32 ad = 0;
 	    int incr = 0;
 
 	    if (get_fp_ad (opcode, &ad) == 0) {
@@ -901,7 +901,7 @@ void fpp_opp (uae_u32 opcode, uae_u16 ex
 		m68k_areg (regs, opcode & 7) = ad;
 	} else {
 	    /* FMOVEM memory->FPP */
-	    uae_u32 ad;
+	    uae_u32 ad = 0;
 
 	    if (get_fp_ad (opcode, &ad) == 0) {
 		m68k_setpc (m68k_getpc () - 4);
@@ -931,7 +931,8 @@ void fpp_opp (uae_u32 opcode, uae_u16 ex
     case 6:
     case 7:
     {
-	uae_u32 ad, list = 0;
+	uae_u32 ad = 0;
+	uae_u32 list = 0;
 	int incr = 0;
 	if (extra & 0x2000) {
 	    /* FMOVEM FPP->memory */